diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2017-05-16 15:11:27 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2017-05-16 15:11:55 +0300 |
| commit | 48a4a934c47dbfd43e03aa61e177c936b0d8d016 (patch) | |
| tree | aa131ac95948e4584f41030fe88f412958273e4a | |
| parent | 9f8000790426e6c013dcb828c997a7dd72f5e3e1 (diff) | |
| download | gitlab-ce-acet-mr-widget-nothing-to-commit-state.tar.gz | |
Address MR comments.acet-mr-widget-nothing-to-commit-state
2 files changed, 1 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_nothing_to_merge.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_nothing_to_merge.js index c314776d9bb..375a382615a 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_nothing_to_merge.js +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_nothing_to_merge.js @@ -32,7 +32,6 @@ export default { <a v-if="mr.newBlobPath" :href="mr.newBlobPath" - role="button" class="btn btn-inverted btn-save"> Create file </a> 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 0d632c7f4e5..a8a02fa6b66 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 @@ -15,7 +15,7 @@ describe('MRWidgetNothingToMerge', () => { it('should have correct elements', () => { expect(vm.$el.classList.contains('mr-widget-body')).toBeTruthy(); expect(vm.$el.querySelector('a').href).toContain(newBlobPath); - expect(vm.$el.innerText).toContain("Currently there are no changes in this merge request's source branch"); + expect(vm.$el.innerText).toContain('Currently there are no changes in this merge request\'s source branch'); expect(vm.$el.innerText).toContain('Please push new commits or use a different branch.'); }); |