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
e0b4d919
Commit
e0b4d919
authored
Jan 26, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
spec fixes after API axios change
parent
9af1773f
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
11 deletions
+19
-11
spec/javascripts/lib/utils/users_cache_spec.js
spec/javascripts/lib/utils/users_cache_spec.js
+3
-1
spec/javascripts/repo/components/repo_commit_section_spec.js
spec/javascripts/repo/components/repo_commit_section_spec.js
+4
-2
spec/javascripts/repo/stores/actions_spec.js
spec/javascripts/repo/stores/actions_spec.js
+12
-8
No files found.
spec/javascripts/lib/utils/users_cache_spec.js
View file @
e0b4d919
...
@@ -92,7 +92,9 @@ describe('UsersCache', () => {
...
@@ -92,7 +92,9 @@ describe('UsersCache', () => {
apiSpy
=
(
query
,
options
)
=>
{
apiSpy
=
(
query
,
options
)
=>
{
expect
(
query
).
toBe
(
''
);
expect
(
query
).
toBe
(
''
);
expect
(
options
).
toEqual
({
username
:
dummyUsername
});
expect
(
options
).
toEqual
({
username
:
dummyUsername
});
return
Promise
.
resolve
([
dummyUser
]);
return
Promise
.
resolve
({
data
:
[
dummyUser
],
});
};
};
UsersCache
.
retrieve
(
dummyUsername
)
UsersCache
.
retrieve
(
dummyUsername
)
...
...
spec/javascripts/repo/components/repo_commit_section_spec.js
View file @
e0b4d919
...
@@ -87,8 +87,10 @@ describe('RepoCommitSection', () => {
...
@@ -87,8 +87,10 @@ describe('RepoCommitSection', () => {
changedFiles
=
JSON
.
parse
(
JSON
.
stringify
(
vm
.
$store
.
getters
.
changedFiles
));
changedFiles
=
JSON
.
parse
(
JSON
.
stringify
(
vm
.
$store
.
getters
.
changedFiles
));
spyOn
(
service
,
'
commit
'
).
and
.
returnValue
(
Promise
.
resolve
({
spyOn
(
service
,
'
commit
'
).
and
.
returnValue
(
Promise
.
resolve
({
data
:
{
short_id
:
'
1
'
,
short_id
:
'
1
'
,
stats
:
{},
stats
:
{},
},
}));
}));
});
});
...
...
spec/javascripts/repo/stores/actions_spec.js
View file @
e0b4d919
...
@@ -250,6 +250,7 @@ describe('Multi-file store actions', () => {
...
@@ -250,6 +250,7 @@ describe('Multi-file store actions', () => {
describe
(
'
success
'
,
()
=>
{
describe
(
'
success
'
,
()
=>
{
beforeEach
(()
=>
{
beforeEach
(()
=>
{
spyOn
(
service
,
'
commit
'
).
and
.
returnValue
(
Promise
.
resolve
({
spyOn
(
service
,
'
commit
'
).
and
.
returnValue
(
Promise
.
resolve
({
data
:
{
id
:
'
123456
'
,
id
:
'
123456
'
,
short_id
:
'
123
'
,
short_id
:
'
123
'
,
message
:
'
test message
'
,
message
:
'
test message
'
,
...
@@ -258,6 +259,7 @@ describe('Multi-file store actions', () => {
...
@@ -258,6 +259,7 @@ describe('Multi-file store actions', () => {
additions
:
'
1
'
,
additions
:
'
1
'
,
deletions
:
'
2
'
,
deletions
:
'
2
'
,
},
},
},
}));
}));
});
});
...
@@ -324,7 +326,9 @@ describe('Multi-file store actions', () => {
...
@@ -324,7 +326,9 @@ describe('Multi-file store actions', () => {
describe
(
'
failed
'
,
()
=>
{
describe
(
'
failed
'
,
()
=>
{
beforeEach
(()
=>
{
beforeEach
(()
=>
{
spyOn
(
service
,
'
commit
'
).
and
.
returnValue
(
Promise
.
resolve
({
spyOn
(
service
,
'
commit
'
).
and
.
returnValue
(
Promise
.
resolve
({
data
:
{
message
:
'
failed message
'
,
message
:
'
failed message
'
,
},
}));
}));
});
});
...
...
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