diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-07 21:09:15 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-07 21:09:15 +0300 |
commit | 1869c23b11aeda0f8183dd324ebadf59505846f0 (patch) | |
tree | f38d6363d0a0962837b0d479df064e8bd8e49d34 /spec/frontend | |
parent | 06c9acad67a086a66f1d63aa1b79fc77a19cc646 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend')
-rw-r--r-- | spec/frontend/ci/pipeline_editor/components/header/pipeline_editor_header_spec.js | 4 | ||||
-rw-r--r-- | spec/frontend/merge_request_tabs_spec.js | 16 |
2 files changed, 20 insertions, 0 deletions
diff --git a/spec/frontend/ci/pipeline_editor/components/header/pipeline_editor_header_spec.js b/spec/frontend/ci/pipeline_editor/components/header/pipeline_editor_header_spec.js index a651664851e..655bfe538c6 100644 --- a/spec/frontend/ci/pipeline_editor/components/header/pipeline_editor_header_spec.js +++ b/spec/frontend/ci/pipeline_editor/components/header/pipeline_editor_header_spec.js @@ -1,4 +1,5 @@ import { shallowMount } from '@vue/test-utils'; +import { GlCard } from '@gitlab/ui'; import PipelineEditorHeader from '~/ci/pipeline_editor/components/header/pipeline_editor_header.vue'; import PipelineStatus from '~/ci/pipeline_editor/components/header/pipeline_status.vue'; import ValidationSegment from '~/ci/pipeline_editor/components/header/validation_segment.vue'; @@ -20,6 +21,9 @@ describe('Pipeline editor header', () => { isNewCiConfigFile: false, ...props, }, + stubs: { + GlCard, + }, }); }; diff --git a/spec/frontend/merge_request_tabs_spec.js b/spec/frontend/merge_request_tabs_spec.js index 3b8c9dd3bf3..6c4ea7063ad 100644 --- a/spec/frontend/merge_request_tabs_spec.js +++ b/spec/frontend/merge_request_tabs_spec.js @@ -281,6 +281,14 @@ describe('MergeRequestTabs', () => { testContext.class.expandViewContainer(); expect($('.content-wrapper .container-limited')).toHaveLength(0); }); + + it('adds the diff-specific width-limiter', () => { + testContext.class.expandViewContainer(); + + expect(testContext.class.contentWrapper.classList.contains('diffs-container-limited')).toBe( + true, + ); + }); }); describe('resetViewContainer', () => { @@ -302,6 +310,14 @@ describe('MergeRequestTabs', () => { expect($('.content-wrapper .container-limited')).toHaveLength(1); }); + + it('removes the diff-specific width-limiter', () => { + testContext.class.resetViewContainer(); + + expect(testContext.class.contentWrapper.classList.contains('diffs-container-limited')).toBe( + false, + ); + }); }); describe('tabShown', () => { |