summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-05-11 11:36:34 +0100
committerPhil Hughes <me@iamphill.com>2018-05-25 12:55:59 +0100
commit323e402e21a643da22714bdede3cc6e248ba2cf4 (patch)
tree3bfdfbcde9f1980bc82fb4f1106959824b4db058
parenta57e43dd8cf29b7574fcab63948fa2aaca1c00b7 (diff)
downloadgitlab-ce-323e402e21a643da22714bdede3cc6e248ba2cf4.tar.gz
fixed tests failing caused by rewire
-rw-r--r--app/assets/javascripts/ide/stores/modules/merge_requests/actions.js2
-rw-r--r--spec/javascripts/ide/helpers.js2
2 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/javascripts/ide/stores/modules/merge_requests/actions.js b/app/assets/javascripts/ide/stores/modules/merge_requests/actions.js
index 856be0d73cd..5afecb2af0d 100644
--- a/app/assets/javascripts/ide/stores/modules/merge_requests/actions.js
+++ b/app/assets/javascripts/ide/stores/modules/merge_requests/actions.js
@@ -20,3 +20,5 @@ export const fetchMergeRequests = ({ dispatch, state }) => {
})
.catch(() => dispatch('receiveMergeRequestsError'));
};
+
+export default () => {};
diff --git a/spec/javascripts/ide/helpers.js b/spec/javascripts/ide/helpers.js
index 98db6defc7a..bc9a7f97b37 100644
--- a/spec/javascripts/ide/helpers.js
+++ b/spec/javascripts/ide/helpers.js
@@ -1,11 +1,13 @@
import { decorateData } from '~/ide/stores/utils';
import state from '~/ide/stores/state';
import commitState from '~/ide/stores/modules/commit/state';
+import mergeRequestsState from '~/ide/stores/modules/merge_requests/state';
export const resetStore = store => {
const newState = {
...state(),
commit: commitState(),
+ mergeRequests: mergeRequestsState(),
};
store.replaceState(newState);
};