diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-02-01 16:13:10 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-02-01 16:21:38 +0000 |
| commit | 3fed0302cb383ca3714c2fc540ac777409020862 (patch) | |
| tree | 8d4ac87cd5a90e537eaa3eee80c9309a6ba91eea | |
| parent | c8a17cd1bd5fe16b6374ba93cc70a04cdeedbe21 (diff) | |
| download | gitlab-ce-3fed0302cb383ca3714c2fc540ac777409020862.tar.gz | |
Transform `a` tag with button role into a `button`
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/mr_widget_merge_help.vue | 10 | ||||
| -rw-r--r-- | spec/javascripts/vue_mr_widget/components/mr_widget_merge_help_spec.js | 10 |
2 files changed, 11 insertions, 9 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_merge_help.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_merge_help.vue index fe09c53272e..62b61e1f41f 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_merge_help.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_merge_help.vue @@ -29,11 +29,13 @@ {{ s__("mrWidget|You can merge this merge request manually using the") }} </template> - <a - role="button" + <button + type="button" + class="btn-link btn-blank js-open-modal-help" data-toggle="modal" - href="#modal_merge_info"> + data-target="#modal_merge_info" + > {{ s__("mrWidget|command line") }} - </a> + </button> </section> </template> diff --git a/spec/javascripts/vue_mr_widget/components/mr_widget_merge_help_spec.js b/spec/javascripts/vue_mr_widget/components/mr_widget_merge_help_spec.js index f6656ad2e80..cc43639f576 100644 --- a/spec/javascripts/vue_mr_widget/components/mr_widget_merge_help_spec.js +++ b/spec/javascripts/vue_mr_widget/components/mr_widget_merge_help_spec.js @@ -29,9 +29,9 @@ describe('MRWidgetMergeHelp', () => { ); }); - it('renders element to open a modal', () => { - expect(vm.$el.querySelector('a').getAttribute('href')).toEqual('#modal_merge_info'); - expect(vm.$el.querySelector('a').getAttribute('data-toggle')).toEqual('modal'); + it('renders button to open help modal', () => { + expect(vm.$el.querySelector('.js-open-modal-help').getAttribute('data-target')).toEqual('#modal_merge_info'); + expect(vm.$el.querySelector('.js-open-modal-help').getAttribute('data-toggle')).toEqual('modal'); }); }); @@ -49,8 +49,8 @@ describe('MRWidgetMergeHelp', () => { }); it('renders element to open a modal', () => { - expect(vm.$el.querySelector('a').getAttribute('href')).toEqual('#modal_merge_info'); - expect(vm.$el.querySelector('a').getAttribute('data-toggle')).toEqual('modal'); + expect(vm.$el.querySelector('.js-open-modal-help').getAttribute('data-target')).toEqual('#modal_merge_info'); + expect(vm.$el.querySelector('.js-open-modal-help').getAttribute('data-toggle')).toEqual('modal'); }); }); }); |