diff options
| author | George Tsiolis <tsiolis.g@gmail.com> | 2018-03-06 00:36:34 +0200 |
|---|---|---|
| committer | George Tsiolis <tsiolis.g@gmail.com> | 2018-03-19 13:02:48 +0200 |
| commit | 07e7b15f80815ac11e4625c7678f76c599c76a6b (patch) | |
| tree | 0b85b3a54ad3994a0970a71e60f340af4dc02d49 /spec | |
| parent | e1739e47c5664c93c66dd58ded59f9d79cd8a426 (diff) | |
| download | gitlab-ce-07e7b15f80815ac11e4625c7678f76c599c76a6b.tar.gz | |
Move ShaMismatch vue component
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/javascripts/vue_mr_widget/components/states/mr_widget_sha_mismatch_spec.js | 9 |
1 files changed, 5 insertions, 4 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 4c67504b642..25684861724 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,16 +1,17 @@ import Vue from 'vue'; -import shaMismatchComponent from '~/vue_merge_request_widget/components/states/mr_widget_sha_mismatch'; +import ShaMismatch from '~/vue_merge_request_widget/components/states/sha_mismatch.vue'; -describe('MRWidgetSHAMismatch', () => { +describe('ShaMismatch', () => { describe('template', () => { - const Component = Vue.extend(shaMismatchComponent); + const Component = Vue.extend(ShaMismatch); const vm = new Component({ el: document.createElement('div'), }); it('should have correct elements', () => { expect(vm.$el.classList.contains('mr-widget-body')).toBeTruthy(); expect(vm.$el.querySelector('button').getAttribute('disabled')).toBeTruthy(); - expect(vm.$el.innerText).toContain('The source branch HEAD has recently changed. Please reload the page and review the changes before merging'); + expect(vm.$el.innerText).toContain('The source branch HEAD has recently changed.'); + expect(vm.$el.innerText).toContain('Please reload the page and review the changes before merging.'); }); }); }); |
