diff options
| author | Mayra Cabrera <mcabrera@gitlab.com> | 2019-07-29 19:20:29 +0000 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2019-07-29 19:20:29 +0000 |
| commit | c7a7e795b9482e33df8fb50e2c22a132263ab533 (patch) | |
| tree | 8516c83fda8fe09099e52867d477cf3185c19850 | |
| parent | f74ff92587d28a54c8b7281bec2cf5a1ae8952b1 (diff) | |
| parent | 9658e5ec33f01542879bcebd1ec2917b306dc77f (diff) | |
| download | gitlab-ce-c7a7e795b9482e33df8fb50e2c22a132263ab533.tar.gz | |
Merge branch 'tp-qtt182-12' into 'master'
Change qa-* class references to js-* for squash-checkbox
Closes gitlab-org/quality/team-tasks#182
See merge request gitlab-org/gitlab-ce!31214
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue | 2 | ||||
| -rw-r--r-- | spec/javascripts/vue_mr_widget/components/states/mr_widget_squash_before_merge_spec.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue index accb9d9fef1..98f682c2e8a 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue @@ -36,7 +36,7 @@ export default { :disabled="isDisabled" type="checkbox" name="squash" - class="qa-squash-checkbox" + class="qa-squash-checkbox js-squash-checkbox" @change="$emit('input', $event.target.checked)" /> {{ __('Squash commits') }} diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_squash_before_merge_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_squash_before_merge_spec.js index d6d8eecfcb9..cb656525f06 100644 --- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_squash_before_merge_spec.js +++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_squash_before_merge_spec.js @@ -21,7 +21,7 @@ describe('Squash before merge component', () => { }); describe('checkbox', () => { - const findCheckbox = () => wrapper.find('.qa-squash-checkbox'); + const findCheckbox = () => wrapper.find('.js-squash-checkbox'); it('is unchecked if passed value prop is false', () => { createComponent({ |