summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-04-13 10:58:42 +0100
committerPhil Hughes <me@iamphill.com>2018-04-13 10:58:42 +0100
commitf75330781f85d555560f8d79657ef8930ad7d9d5 (patch)
tree7b48e4760471ba26bfab353cd573e06c1fa3c6fb
parent4e56af3b7df9f61c91a2888c840214ae29d8e5ee (diff)
downloadgitlab-ce-f75330781f85d555560f8d79657ef8930ad7d9d5.tar.gz
fixed actions spec
-rw-r--r--spec/javascripts/ide/stores/modules/commit/actions_spec.js27
1 files changed, 12 insertions, 15 deletions
diff --git a/spec/javascripts/ide/stores/modules/commit/actions_spec.js b/spec/javascripts/ide/stores/modules/commit/actions_spec.js
index afaf147d6fd..1946a0c547c 100644
--- a/spec/javascripts/ide/stores/modules/commit/actions_spec.js
+++ b/spec/javascripts/ide/stores/modules/commit/actions_spec.js
@@ -317,21 +317,6 @@ describe('IDE commit module actions', () => {
.then(done)
.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', () => {
@@ -446,6 +431,18 @@ describe('IDE commit module actions', () => {
.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', () => {
it('redirects to new merge request page', done => {
spyOn(eventHub, '$on');