Commit 35023d43 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Merge branch 'revert-93f16f3d' into 'master'

Revert "Merge branch 'winh-fix-flaky-dashboard_spec' into 'master'"

Closes gitlab-ee#14795

See merge request gitlab-org/gitlab-ce!32753
parents 222d9e62 3d7b3300
...@@ -40,7 +40,6 @@ class CustomEnvironment extends JSDOMEnvironment { ...@@ -40,7 +40,6 @@ class CustomEnvironment extends JSDOMEnvironment {
this.global.fixturesBasePath = `${ROOT_PATH}/tmp/tests/frontend/fixtures${IS_EE ? '-ee' : ''}`; this.global.fixturesBasePath = `${ROOT_PATH}/tmp/tests/frontend/fixtures${IS_EE ? '-ee' : ''}`;
this.global.staticFixturesBasePath = `${ROOT_PATH}/spec/frontend/fixtures`; this.global.staticFixturesBasePath = `${ROOT_PATH}/spec/frontend/fixtures`;
this.global.IS_EE = IS_EE;
// Not yet supported by JSDOM: https://github.com/jsdom/jsdom/issues/317 // Not yet supported by JSDOM: https://github.com/jsdom/jsdom/issues/317
this.global.document.createRange = () => ({ this.global.document.createRange = () => ({
......
...@@ -73,9 +73,6 @@ expect.extend(customMatchers); ...@@ -73,9 +73,6 @@ expect.extend(customMatchers);
// Tech debt issue TBD // Tech debt issue TBD
testUtilsConfig.logModifiedComponents = false; testUtilsConfig.logModifiedComponents = false;
// Stub for URL.createObjectURL
window.URL.createObjectURL = function createObjectURL() {};
// Basic stub for MutationObserver // Basic stub for MutationObserver
global.MutationObserver = () => ({ global.MutationObserver = () => ({
disconnect: () => {}, disconnect: () => {},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment