diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-18 20:02:30 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-18 20:02:30 +0000 |
commit | 41fe97390ceddf945f3d967b8fdb3de4c66b7dea (patch) | |
tree | 9c8d89a8624828992f06d892cd2f43818ff5dcc8 /spec/frontend/pipelines/pipelines_table_spec.js | |
parent | 0804d2dc31052fb45a1efecedc8e06ce9bc32862 (diff) | |
download | gitlab-ce-41fe97390ceddf945f3d967b8fdb3de4c66b7dea.tar.gz |
Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42
Diffstat (limited to 'spec/frontend/pipelines/pipelines_table_spec.js')
-rw-r--r-- | spec/frontend/pipelines/pipelines_table_spec.js | 63 |
1 files changed, 5 insertions, 58 deletions
diff --git a/spec/frontend/pipelines/pipelines_table_spec.js b/spec/frontend/pipelines/pipelines_table_spec.js index f200d683a7a..7b49baa5a20 100644 --- a/spec/frontend/pipelines/pipelines_table_spec.js +++ b/spec/frontend/pipelines/pipelines_table_spec.js @@ -17,7 +17,6 @@ import { import eventHub from '~/pipelines/event_hub'; import CiBadge from '~/vue_shared/components/ci_badge_link.vue'; -import CommitComponent from '~/vue_shared/components/commit.vue'; jest.mock('~/pipelines/event_hub'); @@ -37,18 +36,13 @@ describe('Pipelines Table', () => { return pipelines.find((p) => p.user !== null && p.commit !== null); }; - const createComponent = (props = {}, rearrangePipelinesTable = false) => { + const createComponent = (props = {}) => { wrapper = extendedWrapper( mount(PipelinesTable, { propsData: { ...defaultProps, ...props, }, - provide: { - glFeatures: { - rearrangePipelinesTable, - }, - }, }), ); }; @@ -57,7 +51,6 @@ describe('Pipelines Table', () => { const findStatusBadge = () => wrapper.findComponent(CiBadge); const findPipelineInfo = () => wrapper.findComponent(PipelineUrl); const findTriggerer = () => wrapper.findComponent(PipelineTriggerer); - const findCommit = () => wrapper.findComponent(CommitComponent); const findPipelineMiniGraph = () => wrapper.findComponent(PipelineMiniGraph); const findTimeAgo = () => wrapper.findComponent(PipelinesTimeago); const findActions = () => wrapper.findComponent(PipelineOperations); @@ -65,10 +58,7 @@ describe('Pipelines Table', () => { const findTableRows = () => wrapper.findAllByTestId('pipeline-table-row'); const findStatusTh = () => wrapper.findByTestId('status-th'); const findPipelineTh = () => wrapper.findByTestId('pipeline-th'); - const findTriggererTh = () => wrapper.findByTestId('triggerer-th'); - const findCommitTh = () => wrapper.findByTestId('commit-th'); const findStagesTh = () => wrapper.findByTestId('stages-th'); - const findTimeAgoTh = () => wrapper.findByTestId('timeago-th'); const findActionsTh = () => wrapper.findByTestId('actions-th'); const findRetryBtn = () => wrapper.findByTestId('pipelines-retry-button'); const findCancelBtn = () => wrapper.findByTestId('pipelines-cancel-button'); @@ -82,7 +72,7 @@ describe('Pipelines Table', () => { wrapper = null; }); - describe('Pipelines Table with rearrangePipelinesTable feature flag turned off', () => { + describe('Pipelines Table', () => { beforeEach(() => { createComponent({ pipelines: [pipeline], viewType: 'root' }); }); @@ -93,11 +83,8 @@ describe('Pipelines Table', () => { it('should render table head with correct columns', () => { expect(findStatusTh().text()).toBe('Status'); - expect(findPipelineTh().text()).toBe('Pipeline ID'); - expect(findTriggererTh().text()).toBe('Triggerer'); - expect(findCommitTh().text()).toBe('Commit'); + expect(findPipelineTh().text()).toBe('Pipeline'); expect(findStagesTh().text()).toBe('Stages'); - expect(findTimeAgoTh().text()).toBe('Duration'); expect(findActionsTh().text()).toBe('Actions'); }); @@ -125,27 +112,6 @@ describe('Pipelines Table', () => { }); }); - describe('triggerer cell', () => { - it('should render the pipeline triggerer', () => { - expect(findTriggerer().exists()).toBe(true); - }); - }); - - describe('commit cell', () => { - it('should render commit information', () => { - expect(findCommit().exists()).toBe(true); - }); - - it('should display and link to commit', () => { - expect(findCommit().text()).toContain(pipeline.commit.short_id); - expect(findCommit().props('commitUrl')).toBe(pipeline.commit.commit_path); - }); - - it('should display the commit author', () => { - expect(findCommit().props('author')).toEqual(pipeline.commit.author); - }); - }); - describe('stages cell', () => { it('should render a pipeline mini graph', () => { expect(findPipelineMiniGraph().exists()).toBe(true); @@ -163,7 +129,7 @@ describe('Pipelines Table', () => { pipeline = createMockPipeline(); pipeline.details.stages = null; - createComponent({ pipelines: [pipeline] }, true); + createComponent({ pipelines: [pipeline] }); }); it('stages are not rendered', () => { @@ -176,7 +142,7 @@ describe('Pipelines Table', () => { }); it('when update graph dropdown is set, should update graph dropdown', () => { - createComponent({ pipelines: [pipeline], updateGraphDropdown: true }, true); + createComponent({ pipelines: [pipeline], updateGraphDropdown: true }); expect(findPipelineMiniGraph().props('updateDropdown')).toBe(true); }); @@ -207,30 +173,11 @@ describe('Pipelines Table', () => { expect(findCancelBtn().attributes('title')).toBe(BUTTON_TOOLTIP_CANCEL); }); }); - }); - - describe('Pipelines Table with rearrangePipelinesTable feature flag turned on', () => { - beforeEach(() => { - createComponent({ pipelines: [pipeline], viewType: 'root' }, true); - }); - - it('should render table head with correct columns', () => { - expect(findStatusTh().text()).toBe('Status'); - expect(findPipelineTh().text()).toBe('Pipeline'); - expect(findStagesTh().text()).toBe('Stages'); - expect(findActionsTh().text()).toBe('Actions'); - }); describe('triggerer cell', () => { it('should render the pipeline triggerer', () => { expect(findTriggerer().exists()).toBe(true); }); }); - - describe('commit cell', () => { - it('should not render commit information', () => { - expect(findCommit().exists()).toBe(false); - }); - }); }); }); |