diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-20 09:07:18 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-20 09:07:18 +0000 |
commit | 11b9d80bd76531de59013e773957b46d014b82af (patch) | |
tree | 56bdd016df9b196a797b0c18d5cfc30960d5c385 /spec/frontend/pipelines | |
parent | e49f1ae46a164511ba79a08fea137ced2c357d6b (diff) | |
download | gitlab-ce-11b9d80bd76531de59013e773957b46d014b82af.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/pipelines')
-rw-r--r-- | spec/frontend/pipelines/components/pipeline_mini_graph/pipeline_stage_spec.js | 4 | ||||
-rw-r--r-- | spec/frontend/pipelines/pipelines_actions_spec.js | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/spec/frontend/pipelines/components/pipeline_mini_graph/pipeline_stage_spec.js b/spec/frontend/pipelines/components/pipeline_mini_graph/pipeline_stage_spec.js index 4d81803a9c0..6bc19b592cd 100644 --- a/spec/frontend/pipelines/components/pipeline_mini_graph/pipeline_stage_spec.js +++ b/spec/frontend/pipelines/components/pipeline_mini_graph/pipeline_stage_spec.js @@ -4,7 +4,7 @@ import { mount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; import CiIcon from '~/vue_shared/components/ci_icon.vue'; import axios from '~/lib/utils/axios_utils'; -import { HTTP_STATUS_OK } from '~/lib/utils/http_status'; +import { HTTP_STATUS_INTERNAL_SERVER_ERROR, HTTP_STATUS_OK } from '~/lib/utils/http_status'; import PipelineStage from '~/pipelines/components/pipeline_mini_graph/pipeline_stage.vue'; import eventHub from '~/pipelines/event_hub'; import waitForPromises from 'helpers/wait_for_promises'; @@ -149,7 +149,7 @@ describe('Pipelines stage component', () => { describe('when user opens dropdown and stage request fails', () => { it('should close the dropdown', async () => { - mock.onGet(dropdownPath).reply(500); + mock.onGet(dropdownPath).reply(HTTP_STATUS_INTERNAL_SERVER_ERROR); createComponent(); await openStageDropdown(); diff --git a/spec/frontend/pipelines/pipelines_actions_spec.js b/spec/frontend/pipelines/pipelines_actions_spec.js index 384c48b99c6..e034d52a33c 100644 --- a/spec/frontend/pipelines/pipelines_actions_spec.js +++ b/spec/frontend/pipelines/pipelines_actions_spec.js @@ -7,7 +7,7 @@ import waitForPromises from 'helpers/wait_for_promises'; import { TEST_HOST } from 'spec/test_constants'; import { createAlert } from '~/flash'; import axios from '~/lib/utils/axios_utils'; -import { HTTP_STATUS_OK } from '~/lib/utils/http_status'; +import { HTTP_STATUS_INTERNAL_SERVER_ERROR, HTTP_STATUS_OK } from '~/lib/utils/http_status'; import { confirmAction } from '~/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal'; import PipelinesManualActions from '~/pipelines/components/pipelines_list/pipelines_manual_actions.vue'; import GlCountdown from '~/vue_shared/components/gl_countdown.vue'; @@ -83,7 +83,7 @@ describe('Pipelines Actions dropdown', () => { }); it('makes a failed request and toggles the loading state', async () => { - mock.onPost(mockActions.path).reply(500); + mock.onPost(mockActions.path).reply(HTTP_STATUS_INTERNAL_SERVER_ERROR); findAllDropdownItems().at(0).vm.$emit('click'); |