diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-03 00:07:46 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-03 00:07:46 +0300 |
commit | 9579eee8954e0405c2dadb19c2a73c9597ce37ea (patch) | |
tree | d90223b7e449d8d25eef60ad16084ce0d2ca2b1b /spec/frontend/notes | |
parent | 0a9b6b99a9bdcacea434501320f1a8d131a33827 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/notes')
-rw-r--r-- | spec/frontend/notes/components/discussion_filter_spec.js | 3 | ||||
-rw-r--r-- | spec/frontend/notes/components/note_awards_list_spec.js | 3 | ||||
-rw-r--r-- | spec/frontend/notes/components/notes_app_spec.js | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/spec/frontend/notes/components/discussion_filter_spec.js b/spec/frontend/notes/components/discussion_filter_spec.js index ed9fc47540d..ed1ced1b3d1 100644 --- a/spec/frontend/notes/components/discussion_filter_spec.js +++ b/spec/frontend/notes/components/discussion_filter_spec.js @@ -7,6 +7,7 @@ import { TEST_HOST } from 'helpers/test_constants'; import createEventHub from '~/helpers/event_hub_factory'; import axios from '~/lib/utils/axios_utils'; +import { HTTP_STATUS_OK } from '~/lib/utils/http_status'; import DiscussionFilter from '~/notes/components/discussion_filter.vue'; import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue'; import Tracking from '~/tracking'; @@ -74,7 +75,7 @@ describe('DiscussionFilter component', () => { // We are mocking the discussions retrieval, // as it doesn't matter for our tests here - mock.onGet(DISCUSSION_PATH).reply(200, ''); + mock.onGet(DISCUSSION_PATH).reply(HTTP_STATUS_OK, ''); window.mrTabs = undefined; wrapper = mountComponent(); jest.spyOn(Tracking, 'event'); diff --git a/spec/frontend/notes/components/note_awards_list_spec.js b/spec/frontend/notes/components/note_awards_list_spec.js index 9fc89ffa473..89ac0216f41 100644 --- a/spec/frontend/notes/components/note_awards_list_spec.js +++ b/spec/frontend/notes/components/note_awards_list_spec.js @@ -2,6 +2,7 @@ import AxiosMockAdapter from 'axios-mock-adapter'; import Vue from 'vue'; import { TEST_HOST } from 'helpers/test_constants'; import axios from '~/lib/utils/axios_utils'; +import { HTTP_STATUS_OK } from '~/lib/utils/http_status'; import awardsNote from '~/notes/components/note_awards_list.vue'; import createStore from '~/notes/stores'; import { noteableDataMock, notesDataMock } from '../mock_data'; @@ -17,7 +18,7 @@ describe('note_awards_list component', () => { beforeEach(() => { mock = new AxiosMockAdapter(axios); - mock.onPost(toggleAwardPath).reply(200, ''); + mock.onPost(toggleAwardPath).reply(HTTP_STATUS_OK, ''); const Component = Vue.extend(awardsNote); diff --git a/spec/frontend/notes/components/notes_app_spec.js b/spec/frontend/notes/components/notes_app_spec.js index 0c3d0da4f0f..b08a22f8674 100644 --- a/spec/frontend/notes/components/notes_app_spec.js +++ b/spec/frontend/notes/components/notes_app_spec.js @@ -7,6 +7,7 @@ import waitForPromises from 'helpers/wait_for_promises'; import DraftNote from '~/batch_comments/components/draft_note.vue'; import batchComments from '~/batch_comments/stores/modules/batch_comments'; import axios from '~/lib/utils/axios_utils'; +import { HTTP_STATUS_OK } from '~/lib/utils/http_status'; import { getLocationHash } from '~/lib/utils/url_utility'; import * as urlUtility from '~/lib/utils/url_utility'; import CommentForm from '~/notes/components/comment_form.vue'; @@ -286,7 +287,7 @@ describe('note_app', () => { describe('emoji awards', () => { beforeEach(() => { - axiosMock.onAny().reply(200, []); + axiosMock.onAny().reply(HTTP_STATUS_OK, []); wrapper = mountComponent(); return waitForPromises(); }); |