BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
b28f68ae
Commit
b28f68ae
authored
Mar 23, 2017
by
Jacob Schatz
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'add-stop-to-polling' into 'master'
Adds stop function so we can stop polling anytime See merge request !10191
parents
0115bb4b
70e59559
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
52 additions
and
5 deletions
+52
-5
poll.js
app/assets/javascripts/lib/utils/poll.js
+16
-5
poll_spec.js
spec/javascripts/lib/utils/poll_spec.js
+36
-0
No files found.
app/assets/javascripts/lib/utils/poll.js
View file @
b28f68ae
...
@@ -36,20 +36,21 @@ export default class Poll {
...
@@ -36,20 +36,21 @@ export default class Poll {
this
.
options
.
data
=
options
.
data
||
{};
this
.
options
.
data
=
options
.
data
||
{};
this
.
intervalHeader
=
'POLL-INTERVAL'
;
this
.
intervalHeader
=
'POLL-INTERVAL'
;
this
.
timeoutID
=
null
;
this
.
canPoll
=
true
;
}
}
checkConditions
(
response
)
{
checkConditions
(
response
)
{
const
headers
=
gl
.
utils
.
normalizeHeaders
(
response
.
headers
);
const
headers
=
gl
.
utils
.
normalizeHeaders
(
response
.
headers
);
const
pollInterval
=
headers
[
this
.
intervalHeader
];
const
pollInterval
=
headers
[
this
.
intervalHeader
];
if
(
pollInterval
>
0
&&
response
.
status
===
httpStatusCodes
.
OK
)
{
if
(
pollInterval
>
0
&&
response
.
status
===
httpStatusCodes
.
OK
&&
this
.
canPoll
)
{
this
.
options
.
successCallback
(
response
);
this
.
timeoutID
=
setTimeout
(()
=>
{
setTimeout
(()
=>
{
this
.
makeRequest
();
this
.
makeRequest
();
},
pollInterval
);
},
pollInterval
);
}
else
{
this
.
options
.
successCallback
(
response
);
}
}
this
.
options
.
successCallback
(
response
);
}
}
makeRequest
()
{
makeRequest
()
{
...
@@ -59,4 +60,14 @@ export default class Poll {
...
@@ -59,4 +60,14 @@ export default class Poll {
.
then
(
response
=>
this
.
checkConditions
(
response
))
.
then
(
response
=>
this
.
checkConditions
(
response
))
.
catch
(
error
=>
errorCallback
(
error
));
.
catch
(
error
=>
errorCallback
(
error
));
}
}
/**
* Stops the polling recursive chain
* and guarantees if the timeout is already running it won't make another request by
* cancelling the previously established timeout.
*/
stop
()
{
this
.
canPoll
=
false
;
clearTimeout
(
this
.
timeoutID
);
}
}
}
spec/javascripts/lib/utils/poll_spec.js
View file @
b28f68ae
...
@@ -124,4 +124,40 @@ describe('Poll', () => {
...
@@ -124,4 +124,40 @@ describe('Poll', () => {
Vue
.
http
.
interceptors
=
_
.
without
(
Vue
.
http
.
interceptors
,
pollInterceptor
);
Vue
.
http
.
interceptors
=
_
.
without
(
Vue
.
http
.
interceptors
,
pollInterceptor
);
});
});
describe
(
'stop'
,
()
=>
{
it
(
'stops polling when method is called'
,
(
done
)
=>
{
const
pollInterceptor
=
(
request
,
next
)
=>
{
next
(
request
.
respondWith
(
JSON
.
stringify
([]),
{
status
:
200
,
headers
:
{
'poll-interval'
:
2
}
}));
};
Vue
.
http
.
interceptors
.
push
(
pollInterceptor
);
const
service
=
new
ServiceMock
(
'endpoint'
);
spyOn
(
service
,
'fetch'
).
and
.
callThrough
();
const
Polling
=
new
Poll
({
resource
:
service
,
method
:
'fetch'
,
data
:
{
page
:
1
},
successCallback
:
()
=>
{
Polling
.
stop
();
},
errorCallback
:
callbacks
.
error
,
});
spyOn
(
Polling
,
'stop'
).
and
.
callThrough
();
Polling
.
makeRequest
();
setTimeout
(()
=>
{
expect
(
service
.
fetch
.
calls
.
count
()).
toEqual
(
1
);
expect
(
service
.
fetch
).
toHaveBeenCalledWith
({
page
:
1
});
expect
(
Polling
.
stop
).
toHaveBeenCalled
();
done
();
},
100
);
Vue
.
http
.
interceptors
=
_
.
without
(
Vue
.
http
.
interceptors
,
pollInterceptor
);
});
});
});
});
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment