diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-21 02:50:22 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-21 02:50:22 +0300 |
commit | 9dc93a4519d9d5d7be48ff274127136236a3adb3 (patch) | |
tree | 70467ae3692a0e35e5ea56bcb803eb512a10bedb /spec/frontend/vue_mr_widget/components/states/mr_widget_conflicts_spec.js | |
parent | 4b0f34b6d759d6299322b3a54453e930c6121ff0 (diff) |
Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43
Diffstat (limited to 'spec/frontend/vue_mr_widget/components/states/mr_widget_conflicts_spec.js')
-rw-r--r-- | spec/frontend/vue_mr_widget/components/states/mr_widget_conflicts_spec.js | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_conflicts_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_conflicts_spec.js index dc2f227b29c..fee78d3af94 100644 --- a/spec/frontend/vue_mr_widget/components/states/mr_widget_conflicts_spec.js +++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_conflicts_spec.js @@ -1,4 +1,3 @@ -import { GlPopover } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; import { TEST_HOST } from 'helpers/test_constants'; import { removeBreakLine } from 'helpers/text_helper'; @@ -10,7 +9,6 @@ describe('MRWidgetConflicts', () => { let mergeRequestWidgetGraphql = null; const path = '/conflicts'; - const findPopover = () => wrapper.find(GlPopover); const findResolveButton = () => wrapper.findByTestId('resolve-conflicts-button'); const findMergeLocalButton = () => wrapper.findByTestId('merge-locally-button'); @@ -219,12 +217,8 @@ describe('MRWidgetConflicts', () => { }); }); - it('sets resolve button as disabled', () => { - expect(findResolveButton().attributes('disabled')).toBe('true'); - }); - - it('shows the popover', () => { - expect(findPopover().exists()).toBe(true); + it('should not allow you to resolve the conflicts', () => { + expect(findResolveButton().exists()).toBe(false); }); }); @@ -241,12 +235,9 @@ describe('MRWidgetConflicts', () => { }); }); - it('sets resolve button as disabled', () => { - expect(findResolveButton().attributes('disabled')).toBe(undefined); - }); - - it('does not show the popover', () => { - expect(findPopover().exists()).toBe(false); + it('should allow you to resolve the conflicts', () => { + expect(findResolveButton().text()).toContain('Resolve conflicts'); + expect(findResolveButton().attributes('href')).toEqual(TEST_HOST); }); }); }); |