diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-07 06:07:43 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-07 06:07:43 +0300 |
commit | d0db90848503511d758f29c16a93a1e2b1c3da47 (patch) | |
tree | 58240f1bc91479c60d78114ecccaa97516e9245a /spec/frontend/merge_request_spec.js | |
parent | defeeba1a8d6fa8784db1c50ca4ff9e8b56f539c (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/merge_request_spec.js')
-rw-r--r-- | spec/frontend/merge_request_spec.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/frontend/merge_request_spec.js b/spec/frontend/merge_request_spec.js index 579cee8c022..be16b5ebfd2 100644 --- a/spec/frontend/merge_request_spec.js +++ b/spec/frontend/merge_request_spec.js @@ -3,12 +3,12 @@ import $ from 'jquery'; import { loadHTMLFixture, resetHTMLFixture } from 'helpers/fixtures'; import { TEST_HOST } from 'spec/test_constants'; import waitForPromises from 'helpers/wait_for_promises'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { HTTP_STATUS_CONFLICT, HTTP_STATUS_OK } from '~/lib/utils/http_status'; import MergeRequest from '~/merge_request'; -jest.mock('~/flash'); +jest.mock('~/alert'); describe('MergeRequest', () => { const test = {}; |