diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-12 21:07:13 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-12 21:07:13 +0300 |
commit | ba5be4989e02566ad45191b6d97815e189a26dac (patch) | |
tree | 96a4ace3c3d61ec4aea31cbf548718ef67cfd84b /spec/frontend/environment.js | |
parent | 22a3da26ad21d67acaef7b2598429c8a003f1037 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/environment.js')
-rw-r--r-- | spec/frontend/environment.js | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/spec/frontend/environment.js b/spec/frontend/environment.js index 1c84350bd8e..82e3b50aeb8 100644 --- a/spec/frontend/environment.js +++ b/spec/frontend/environment.js @@ -1,7 +1,7 @@ /* eslint-disable import/no-commonjs, max-classes-per-file */ const path = require('path'); -const JSDOMEnvironment = require('jest-environment-jsdom'); +const { TestEnvironment } = require('jest-environment-jsdom'); const { ErrorWithStack } = require('jest-util'); const { setGlobalDateToFakeDate, @@ -11,10 +11,10 @@ const { TEST_HOST } = require('./__helpers__/test_constants'); const ROOT_PATH = path.resolve(__dirname, '../..'); -class CustomEnvironment extends JSDOMEnvironment { - constructor(config, context) { +class CustomEnvironment extends TestEnvironment { + constructor({ globalConfig, projectConfig }, context) { // Setup testURL so that window.location is setup properly - super({ ...config, testURL: TEST_HOST }, context); + super({ globalConfig, projectConfig: { ...projectConfig, testURL: TEST_HOST } }, context); // Fake the `Date` for `jsdom` which fixes things like document.cookie // https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39496#note_503084332 @@ -39,8 +39,7 @@ class CustomEnvironment extends JSDOMEnvironment { }, }); - const { testEnvironmentOptions } = config; - const { IS_EE } = testEnvironmentOptions; + const { IS_EE } = projectConfig.testEnvironmentOptions; this.global.gon = { ee: IS_EE, }; |