summaryrefslogtreecommitdiff
path: root/spec/javascripts/vue_mr_widget/components/states/mr_widget_sha_mismatch_spec.js
diff options
context:
space:
mode:
authorRyan Cobb <rcobb@gitlab.com>2019-05-29 10:56:38 -0600
committerRyan Cobb <rcobb@gitlab.com>2019-05-29 10:56:38 -0600
commit0393c5059de2ce03f706fbf28056e1d80304b73a (patch)
treef47c4daaf9315c89cc6b039988d57e1fbd14c322 /spec/javascripts/vue_mr_widget/components/states/mr_widget_sha_mismatch_spec.js
parent4fae62b9efa985e4cf6a09cb6bd4b9cf665e6b32 (diff)
parent70d1537dda66da8b319ceefde36195047b26a8fd (diff)
downloadgitlab-ce-0393c5059de2ce03f706fbf28056e1d80304b73a.tar.gz
Merge branch 'master' into 61964-unicorn-instrumentation
Diffstat (limited to 'spec/javascripts/vue_mr_widget/components/states/mr_widget_sha_mismatch_spec.js')
-rw-r--r--spec/javascripts/vue_mr_widget/components/states/mr_widget_sha_mismatch_spec.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_sha_mismatch_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_sha_mismatch_spec.js
index 36f8c7a9683..9324c83bf4b 100644
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_sha_mismatch_spec.js
+++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_sha_mismatch_spec.js
@@ -1,7 +1,7 @@
import Vue from 'vue';
import ShaMismatch from '~/vue_merge_request_widget/components/states/sha_mismatch.vue';
import mountComponent from 'spec/helpers/vue_mount_component_helper';
-import { removeBreakLine } from 'spec/helpers/vue_component_helper';
+import { removeBreakLine } from 'spec/helpers/text_helper';
describe('ShaMismatch', () => {
let vm;