diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-08 00:09:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-08 00:09:58 +0300 |
commit | 919e3e3cd83e76dba137ef9bcc4746214c2085ff (patch) | |
tree | 4e9799b9c6193583896ea1f05137815ff9782796 /spec/frontend | |
parent | 6cae2159b8ce1e84fad48f3dbd5368995cbd87b1 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend')
-rw-r--r-- | spec/frontend/pipelines/mock_data.js | 2 | ||||
-rw-r--r-- | spec/frontend/vue_merge_request_widget/components/mr_widget_pipeline_spec.js | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/spec/frontend/pipelines/mock_data.js b/spec/frontend/pipelines/mock_data.js index 36bce65dd56..dd7e81f3f22 100644 --- a/spec/frontend/pipelines/mock_data.js +++ b/spec/frontend/pipelines/mock_data.js @@ -837,7 +837,6 @@ export const mockPipelineTag = () => { duration: 93, finished_at: '2022-02-02T15:40:59.384Z', event_type_name: 'Pipeline', - name: 'Pipeline', manual_actions: [], scheduled_actions: [], }, @@ -1045,7 +1044,6 @@ export const mockPipelineBranch = () => { duration: 75, finished_at: '2022-01-14T18:02:35.842Z', event_type_name: 'Pipeline', - name: 'Pipeline', manual_actions: [], scheduled_actions: [], }, diff --git a/spec/frontend/vue_merge_request_widget/components/mr_widget_pipeline_spec.js b/spec/frontend/vue_merge_request_widget/components/mr_widget_pipeline_spec.js index 9c348fc9d58..441054493f7 100644 --- a/spec/frontend/vue_merge_request_widget/components/mr_widget_pipeline_spec.js +++ b/spec/frontend/vue_merge_request_widget/components/mr_widget_pipeline_spec.js @@ -224,7 +224,6 @@ describe('MRWidgetPipeline', () => { ({ pipeline } = JSON.parse(JSON.stringify(mockData))); pipeline.details.event_type_name = 'Pipeline'; - pipeline.details.name = 'Pipeline'; pipeline.merge_request_event_type = undefined; pipeline.ref.tag = false; pipeline.ref.branch = false; @@ -266,7 +265,6 @@ describe('MRWidgetPipeline', () => { describe('for a detached merge request pipeline', () => { it('renders a pipeline widget that reads "Merge request pipeline <ID> <status> for <SHA>"', () => { pipeline.details.event_type_name = 'Merge request pipeline'; - pipeline.details.name = 'Merge request pipeline'; pipeline.merge_request_event_type = 'detached'; factory(); |