diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-03-12 16:43:54 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-03-12 16:43:54 +0000 |
| commit | 1be6a4424a37fa76b3cd1b856aa718c186809599 (patch) | |
| tree | 8a5e7a783bcf0ea5548c147a5497ed2a93fae1ea /spec/javascripts/vue_mr_widget/components/states | |
| parent | 53dbad7837935319ac96457f6715f122e08c17a2 (diff) | |
| parent | 02c7f82aa14729589123cbfcd9207a062fbc6d9e (diff) | |
| download | gitlab-ce-1be6a4424a37fa76b3cd1b856aa718c186809599.tar.gz | |
Merge branch 'refactor/move-mr-widget-nothing-to-merge-vue-component' into 'master'
Move NothingToMerge vue component
See merge request gitlab-org/gitlab-ce!17544
Diffstat (limited to 'spec/javascripts/vue_mr_widget/components/states')
| -rw-r--r-- | spec/javascripts/vue_mr_widget/components/states/mr_widget_nothing_to_merge_spec.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_nothing_to_merge_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_nothing_to_merge_spec.js index a8a02fa6b66..2a762c9336e 100644 --- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_nothing_to_merge_spec.js +++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_nothing_to_merge_spec.js @@ -1,9 +1,9 @@ import Vue from 'vue'; -import nothingToMergeComponent from '~/vue_merge_request_widget/components/states/mr_widget_nothing_to_merge'; +import NothingToMerge from '~/vue_merge_request_widget/components/states/nothing_to_merge.vue'; -describe('MRWidgetNothingToMerge', () => { +describe('NothingToMerge', () => { describe('template', () => { - const Component = Vue.extend(nothingToMergeComponent); + const Component = Vue.extend(NothingToMerge); const newBlobPath = '/foo'; const vm = new Component({ el: document.createElement('div'), |