diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 07:08:36 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 07:08:36 +0000 |
commit | 48aff82709769b098321c738f3444b9bdaa694c6 (patch) | |
tree | e00c7c43e2d9b603a5a6af576b1685e400410dee /spec/frontend/vue_mr_widget/components/states/mr_widget_squash_before_merge_spec.js | |
parent | 879f5329ee916a948223f8f43d77fba4da6cd028 (diff) | |
download | gitlab-ce-48aff82709769b098321c738f3444b9bdaa694c6.tar.gz |
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42
Diffstat (limited to 'spec/frontend/vue_mr_widget/components/states/mr_widget_squash_before_merge_spec.js')
-rw-r--r-- | spec/frontend/vue_mr_widget/components/states/mr_widget_squash_before_merge_spec.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_squash_before_merge_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_squash_before_merge_spec.js index 4c213899dbd..5326d63cb8a 100644 --- a/spec/frontend/vue_mr_widget/components/states/mr_widget_squash_before_merge_spec.js +++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_squash_before_merge_spec.js @@ -1,5 +1,6 @@ import { createLocalVue, shallowMount } from '@vue/test-utils'; import SquashBeforeMerge from '~/vue_merge_request_widget/components/states/squash_before_merge.vue'; +import { SQUASH_BEFORE_MERGE } from '~/vue_merge_request_widget/i18n'; const localVue = createLocalVue(); @@ -85,7 +86,7 @@ describe('Squash before merge component', () => { }); describe('tooltip', () => { - const tooltipTitle = () => findLabel().element.dataset.title; + const tooltipTitle = () => findLabel().attributes('title'); it('does not render when isDisabled is false', () => { createComponent({ @@ -101,7 +102,7 @@ describe('Squash before merge component', () => { isDisabled: true, }); - expect(tooltipTitle()).toBe('Required in this project.'); + expect(tooltipTitle()).toBe(SQUASH_BEFORE_MERGE.tooltipTitle); }); }); |