Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'spec/frontend/merge_conflicts/store/actions_spec.js')
-rw-r--r--spec/frontend/merge_conflicts/store/actions_spec.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/spec/frontend/merge_conflicts/store/actions_spec.js b/spec/frontend/merge_conflicts/store/actions_spec.js
index d2c4c8b796c..6fbd17af5af 100644
--- a/spec/frontend/merge_conflicts/store/actions_spec.js
+++ b/spec/frontend/merge_conflicts/store/actions_spec.js
@@ -134,7 +134,7 @@ describe('merge conflicts actions', () => {
describe('setLoadingState', () => {
it('commits the right mutation', () => {
- testAction(
+ return testAction(
actions.setLoadingState,
true,
{},
@@ -151,7 +151,7 @@ describe('merge conflicts actions', () => {
describe('setErrorState', () => {
it('commits the right mutation', () => {
- testAction(
+ return testAction(
actions.setErrorState,
true,
{},
@@ -168,7 +168,7 @@ describe('merge conflicts actions', () => {
describe('setFailedRequest', () => {
it('commits the right mutation', () => {
- testAction(
+ return testAction(
actions.setFailedRequest,
'errors in the request',
{},
@@ -207,7 +207,7 @@ describe('merge conflicts actions', () => {
describe('setSubmitState', () => {
it('commits the right mutation', () => {
- testAction(
+ return testAction(
actions.setSubmitState,
true,
{},
@@ -224,7 +224,7 @@ describe('merge conflicts actions', () => {
describe('updateCommitMessage', () => {
it('commits the right mutation', () => {
- testAction(
+ return testAction(
actions.updateCommitMessage,
'some message',
{},