Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'spec/frontend/merge_request_spec.js')
-rw-r--r--spec/frontend/merge_request_spec.js10
1 files changed, 8 insertions, 2 deletions
diff --git a/spec/frontend/merge_request_spec.js b/spec/frontend/merge_request_spec.js
index bcf64204c7a..16e3e49a297 100644
--- a/spec/frontend/merge_request_spec.js
+++ b/spec/frontend/merge_request_spec.js
@@ -3,9 +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 axios from '~/lib/utils/axios_utils';
import MergeRequest from '~/merge_request';
+jest.mock('~/flash');
+
describe('MergeRequest', () => {
const test = {};
describe('task lists', () => {
@@ -95,8 +98,11 @@ describe('MergeRequest', () => {
await waitForPromises();
- expect(document.querySelector('.flash-container .flash-text').innerText.trim()).toBe(
- 'Someone edited this merge request at the same time you did. Please refresh the page to see changes.',
+ expect(createAlert).toHaveBeenCalledWith(
+ expect.objectContaining({
+ message:
+ 'Someone edited this merge request at the same time you did. Please refresh the page to see changes.',
+ }),
);
});
});