Add latest changes from gitlab-org/gitlab@master

2 files changed, 8 insertions, 4 deletions

diff --git a/spec/frontend/error_tracking/store/actions_spec.js b/spec/frontend/error_tracking/store/actions_spec.js
index 6e6fc6f3351..3ec43010d80 100644
--- a/spec/frontend/error_tracking/store/actions_spec.js
+++ b/spec/frontend/error_tracking/store/actions_spec.js
@@ -4,7 +4,7 @@ import * as actions from '~/error_tracking/store/actions';
 import * as types from '~/error_tracking/store/mutation_types';
 import { createAlert } from '~/flash';
 import axios from '~/lib/utils/axios_utils';
-import { HTTP_STATUS_BAD_REQUEST } from '~/lib/utils/http_status';
+import { HTTP_STATUS_BAD_REQUEST, HTTP_STATUS_OK } from '~/lib/utils/http_status';
 import { visitUrl } from '~/lib/utils/url_utility';
 
 jest.mock('~/flash.js');
@@ -30,7 +30,7 @@ describe('Sentry common store actions', () => {
 
   describe('updateStatus', () => {
     it('should handle successful status update', async () => {
-      mock.onPut().reply(200, {});
+      mock.onPut().reply(HTTP_STATUS_OK, {});
       await testAction(
         actions.updateStatus,
         params,
diff --git a/spec/frontend/error_tracking/store/details/actions_spec.js b/spec/frontend/error_tracking/store/details/actions_spec.js
index 27ab314564f..383d8aaeb20 100644
--- a/spec/frontend/error_tracking/store/details/actions_spec.js
+++ b/spec/frontend/error_tracking/store/details/actions_spec.js
@@ -4,7 +4,11 @@ import * as actions from '~/error_tracking/store/details/actions';
 import * as types from '~/error_tracking/store/details/mutation_types';
 import { createAlert } from '~/flash';
 import axios from '~/lib/utils/axios_utils';
-import { HTTP_STATUS_BAD_REQUEST, HTTP_STATUS_NO_CONTENT } from '~/lib/utils/http_status';
+import {
+  HTTP_STATUS_BAD_REQUEST,
+  HTTP_STATUS_NO_CONTENT,
+  HTTP_STATUS_OK,
+} from '~/lib/utils/http_status';
 import Poll from '~/lib/utils/poll';
 
 let mockedAdapter;
@@ -31,7 +35,7 @@ describe('Sentry error details store actions', () => {
     const endpoint = '123/stacktrace';
     it('should commit SET_ERROR with received response', () => {
       const payload = { error: [1, 2, 3] };
-      mockedAdapter.onGet().reply(200, payload);
+      mockedAdapter.onGet().reply(HTTP_STATUS_OK, payload);
       return testAction(
         actions.startPollingStacktrace,
         { endpoint },