Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
63d3581e
Commit
63d3581e
authored
Mar 12, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed note polling not sending updated last fetched at date
added spec for polling
parent
98e31bf4
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
71 additions
and
7 deletions
+71
-7
app/assets/javascripts/notes/services/notes_service.js
app/assets/javascripts/notes/services/notes_service.js
+3
-2
app/assets/javascripts/notes/stores/actions.js
app/assets/javascripts/notes/stores/actions.js
+2
-4
spec/javascripts/notes/mock_data.js
spec/javascripts/notes/mock_data.js
+1
-1
spec/javascripts/notes/stores/actions_spec.js
spec/javascripts/notes/stores/actions_spec.js
+65
-0
No files found.
app/assets/javascripts/notes/services/notes_service.js
View file @
63d3581e
...
@@ -27,10 +27,11 @@ export default {
...
@@ -27,10 +27,11 @@ export default {
return
Vue
.
http
[
method
](
endpoint
);
return
Vue
.
http
[
method
](
endpoint
);
},
},
poll
(
data
=
{})
{
poll
(
data
=
{})
{
const
{
endpoint
,
lastFetchedAt
}
=
data
;
const
endpoint
=
data
.
notesData
.
notesPath
;
const
lastFetchedAt
=
data
.
lastFetchedAt
;
const
options
=
{
const
options
=
{
headers
:
{
headers
:
{
'
X-Last-Fetched-At
'
:
`
${
lastFetchedAt
}
`
,
'
X-Last-Fetched-At
'
:
lastFetchedAt
?
`
${
lastFetchedAt
}
`
:
undefined
,
},
},
};
};
...
...
app/assets/javascripts/notes/stores/actions.js
View file @
63d3581e
...
@@ -203,12 +203,10 @@ const pollSuccessCallBack = (resp, commit, state, getters) => {
...
@@ -203,12 +203,10 @@ const pollSuccessCallBack = (resp, commit, state, getters) => {
};
};
export
const
poll
=
({
commit
,
state
,
getters
})
=>
{
export
const
poll
=
({
commit
,
state
,
getters
})
=>
{
const
requestData
=
{
endpoint
:
state
.
notesData
.
notesPath
,
lastFetchedAt
:
state
.
lastFetchedAt
};
eTagPoll
=
new
Poll
({
eTagPoll
=
new
Poll
({
resource
:
service
,
resource
:
service
,
method
:
'
poll
'
,
method
:
'
poll
'
,
data
:
requestData
,
data
:
state
,
successCallback
:
resp
=>
resp
.
json
()
successCallback
:
resp
=>
resp
.
json
()
.
then
(
data
=>
pollSuccessCallBack
(
data
,
commit
,
state
,
getters
)),
.
then
(
data
=>
pollSuccessCallBack
(
data
,
commit
,
state
,
getters
)),
errorCallback
:
()
=>
Flash
(
'
Something went wrong while fetching latest comments.
'
),
errorCallback
:
()
=>
Flash
(
'
Something went wrong while fetching latest comments.
'
),
...
@@ -217,7 +215,7 @@ export const poll = ({ commit, state, getters }) => {
...
@@ -217,7 +215,7 @@ export const poll = ({ commit, state, getters }) => {
if
(
!
Visibility
.
hidden
())
{
if
(
!
Visibility
.
hidden
())
{
eTagPoll
.
makeRequest
();
eTagPoll
.
makeRequest
();
}
else
{
}
else
{
service
.
poll
(
requestData
);
service
.
poll
(
state
);
}
}
Visibility
.
change
(()
=>
{
Visibility
.
change
(()
=>
{
...
...
spec/javascripts/notes/mock_data.js
View file @
63d3581e
/* eslint-disable */
/* eslint-disable */
export
const
notesDataMock
=
{
export
const
notesDataMock
=
{
discussionsPath
:
'
/gitlab-org/gitlab-ce/issues/26/discussions.json
'
,
discussionsPath
:
'
/gitlab-org/gitlab-ce/issues/26/discussions.json
'
,
lastFetchedAt
:
'
1501862675
'
,
lastFetchedAt
:
1501862675
,
markdownDocsPath
:
'
/help/user/markdown
'
,
markdownDocsPath
:
'
/help/user/markdown
'
,
newSessionPath
:
'
/users/sign_in?redirect_to_referer=yes
'
,
newSessionPath
:
'
/users/sign_in?redirect_to_referer=yes
'
,
notesPath
:
'
/gitlab-org/gitlab-ce/noteable/issue/98/notes
'
,
notesPath
:
'
/gitlab-org/gitlab-ce/noteable/issue/98/notes
'
,
...
...
spec/javascripts/notes/stores/actions_spec.js
View file @
63d3581e
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
_
from
'
underscore
'
;
import
_
from
'
underscore
'
;
import
{
headersInterceptor
}
from
'
spec/helpers/vue_resource_helper
'
;
import
*
as
actions
from
'
~/notes/stores/actions
'
;
import
*
as
actions
from
'
~/notes/stores/actions
'
;
import
store
from
'
~/notes/stores
'
;
import
store
from
'
~/notes/stores
'
;
import
testAction
from
'
../../helpers/vuex_action_helper
'
;
import
testAction
from
'
../../helpers/vuex_action_helper
'
;
...
@@ -129,4 +130,68 @@ describe('Actions Notes Store', () => {
...
@@ -129,4 +130,68 @@ describe('Actions Notes Store', () => {
],
done
);
],
done
);
});
});
});
});
describe
(
'
poll
'
,
()
=>
{
beforeEach
((
done
)
=>
{
jasmine
.
clock
().
install
();
spyOn
(
Vue
.
http
,
'
get
'
).
and
.
callThrough
();
store
.
dispatch
(
'
setNotesData
'
,
notesDataMock
)
.
then
(
done
)
.
catch
(
done
.
fail
);
});
afterEach
(()
=>
{
jasmine
.
clock
().
uninstall
();
});
it
(
'
calls service with last fetched state
'
,
(
done
)
=>
{
const
interceptor
=
(
request
,
next
)
=>
{
next
(
request
.
respondWith
(
JSON
.
stringify
({
notes
:
[],
last_fetched_at
:
'
123456
'
,
}),
{
status
:
200
,
headers
:
{
'
poll-interval
'
:
'
1000
'
,
},
}));
};
Vue
.
http
.
interceptors
.
push
(
interceptor
);
Vue
.
http
.
interceptors
.
push
(
headersInterceptor
);
store
.
dispatch
(
'
poll
'
)
.
then
(()
=>
new
Promise
(
resolve
=>
requestAnimationFrame
(
resolve
)))
.
then
(()
=>
{
expect
(
Vue
.
http
.
get
).
toHaveBeenCalledWith
(
jasmine
.
anything
(),
{
url
:
jasmine
.
anything
(),
method
:
'
get
'
,
headers
:
{
'
X-Last-Fetched-At
'
:
undefined
,
},
});
expect
(
store
.
state
.
lastFetchedAt
).
toBe
(
'
123456
'
);
jasmine
.
clock
().
tick
(
1500
);
})
.
then
(()
=>
new
Promise
((
resolve
)
=>
{
requestAnimationFrame
(
resolve
);
}))
.
then
(()
=>
{
expect
(
Vue
.
http
.
get
.
calls
.
count
()).
toBe
(
2
);
expect
(
Vue
.
http
.
get
.
calls
.
mostRecent
().
args
[
1
].
headers
).
toEqual
({
'
X-Last-Fetched-At
'
:
'
123456
'
,
});
})
.
then
(()
=>
store
.
dispatch
(
'
stopPolling
'
))
.
then
(()
=>
{
Vue
.
http
.
interceptors
=
_
.
without
(
Vue
.
http
.
interceptors
,
interceptor
);
Vue
.
http
.
interceptors
=
_
.
without
(
Vue
.
http
.
interceptors
,
headersInterceptor
);
})
.
then
(
done
)
.
catch
(
done
.
fail
);
});
});
});
});
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