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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
132be812
Commit
132be812
authored
Jun 15, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix frontend test failures after jasmine upgrade
parent
d5ab729d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
app/assets/javascripts/api.js
app/assets/javascripts/api.js
+2
-2
spec/javascripts/issue_show/components/app_spec.js
spec/javascripts/issue_show/components/app_spec.js
+1
-1
No files found.
app/assets/javascripts/api.js
View file @
132be812
...
@@ -77,7 +77,7 @@ const Api = {
...
@@ -77,7 +77,7 @@ const Api = {
dataType
:
'
json
'
,
dataType
:
'
json
'
,
})
})
.
done
(
label
=>
callback
(
label
))
.
done
(
label
=>
callback
(
label
))
.
error
(
message
=>
callback
(
message
.
responseJSON
));
.
fail
(
message
=>
callback
(
message
.
responseJSON
));
},
},
// Return group projects list. Filtered by query
// Return group projects list. Filtered by query
...
@@ -134,7 +134,7 @@ const Api = {
...
@@ -134,7 +134,7 @@ const Api = {
dataType
:
'
json
'
,
dataType
:
'
json
'
,
})
})
.
done
(
file
=>
callback
(
null
,
file
))
.
done
(
file
=>
callback
(
null
,
file
))
.
error
(
callback
);
.
fail
(
callback
);
},
},
users
(
query
,
options
)
{
users
(
query
,
options
)
{
...
...
spec/javascripts/issue_show/components/app_spec.js
View file @
132be812
...
@@ -126,7 +126,7 @@ describe('Issuable output', () => {
...
@@ -126,7 +126,7 @@ describe('Issuable output', () => {
describe
(
'
updateIssuable
'
,
()
=>
{
describe
(
'
updateIssuable
'
,
()
=>
{
it
(
'
fetches new data after update
'
,
(
done
)
=>
{
it
(
'
fetches new data after update
'
,
(
done
)
=>
{
spyOn
(
vm
.
service
,
'
getData
'
);
spyOn
(
vm
.
service
,
'
getData
'
)
.
and
.
callThrough
()
;
spyOn
(
vm
.
service
,
'
updateIssuable
'
).
and
.
callFake
(()
=>
new
Promise
((
resolve
)
=>
{
spyOn
(
vm
.
service
,
'
updateIssuable
'
).
and
.
callFake
(()
=>
new
Promise
((
resolve
)
=>
{
resolve
({
resolve
({
json
()
{
json
()
{
...
...
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