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
f7533078
Commit
f7533078
authored
Apr 13, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed actions spec
parent
4e56af3b
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
15 deletions
+12
-15
spec/javascripts/ide/stores/modules/commit/actions_spec.js
spec/javascripts/ide/stores/modules/commit/actions_spec.js
+12
-15
No files found.
spec/javascripts/ide/stores/modules/commit/actions_spec.js
View file @
f7533078
...
@@ -317,21 +317,6 @@ describe('IDE commit module actions', () => {
...
@@ -317,21 +317,6 @@ describe('IDE commit module actions', () => {
.
then
(
done
)
.
then
(
done
)
.
catch
(
done
.
fail
);
.
catch
(
done
.
fail
);
});
});
it
(
'
resets stores commit actions
'
,
done
=>
{
store
.
state
.
commit
.
commitAction
=
consts
.
COMMIT_TO_NEW_BRANCH
;
store
.
dispatch
(
'
commit/updateFilesAfterCommit
'
,
{
data
,
branch
,
})
.
then
(()
=>
{
expect
(
store
.
state
.
commit
.
commitAction
).
not
.
toBe
(
consts
.
COMMIT_TO_NEW_BRANCH
);
})
.
then
(
done
)
.
catch
(
done
.
fail
);
});
});
});
describe
(
'
commitChanges
'
,
()
=>
{
describe
(
'
commitChanges
'
,
()
=>
{
...
@@ -446,6 +431,18 @@ describe('IDE commit module actions', () => {
...
@@ -446,6 +431,18 @@ describe('IDE commit module actions', () => {
.
catch
(
done
.
fail
);
.
catch
(
done
.
fail
);
});
});
it
(
'
resets stores commit actions
'
,
done
=>
{
store
.
state
.
commit
.
commitAction
=
consts
.
COMMIT_TO_NEW_BRANCH
;
store
.
dispatch
(
'
commit/commitChanges
'
)
.
then
(()
=>
{
expect
(
store
.
state
.
commit
.
commitAction
).
not
.
toBe
(
consts
.
COMMIT_TO_NEW_BRANCH
);
})
.
then
(
done
)
.
catch
(
done
.
fail
);
});
describe
(
'
merge request
'
,
()
=>
{
describe
(
'
merge request
'
,
()
=>
{
it
(
'
redirects to new merge request page
'
,
done
=>
{
it
(
'
redirects to new merge request page
'
,
done
=>
{
spyOn
(
eventHub
,
'
$on
'
);
spyOn
(
eventHub
,
'
$on
'
);
...
...
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