summaryrefslogtreecommitdiff
path: root/spec/frontend/environment.js
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2019-05-08 14:56:53 -0500
committerRobert Speicher <rspeicher@gmail.com>2019-05-08 14:56:53 -0500
commit2f003b58645b3cbc987c240f844b1ff6eb0c026a (patch)
tree07c2087939b6c6dce33620c57a6989d76547e681 /spec/frontend/environment.js
parent204dca4436f5b2c82611a873d05186ec4ff4c17c (diff)
parent2084301b4ec863d65638cc0c30c124cb5fe4b3d8 (diff)
downloadgitlab-ce-11-11-stable-prepare-rc2.tar.gz
Merge branch 'rs-pre-freeze' into 11-11-stable-prepare-rc211-11-stable-prepare-rc2
Diffstat (limited to 'spec/frontend/environment.js')
-rw-r--r--spec/frontend/environment.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/spec/frontend/environment.js b/spec/frontend/environment.js
index 34df8019a2e..9612162ad0c 100644
--- a/spec/frontend/environment.js
+++ b/spec/frontend/environment.js
@@ -24,8 +24,9 @@ class CustomEnvironment extends JSDOMEnvironment {
});
const { testEnvironmentOptions } = config;
+ const { IS_EE } = testEnvironmentOptions;
this.global.gon = {
- ee: testEnvironmentOptions.IS_EE,
+ ee: IS_EE,
};
this.rejectedPromises = [];
@@ -33,6 +34,10 @@ class CustomEnvironment extends JSDOMEnvironment {
this.global.promiseRejectionHandler = error => {
this.rejectedPromises.push(error);
};
+
+ this.global.fixturesBasePath = `${process.cwd()}/${
+ IS_EE ? 'ee/' : ''
+ }spec/javascripts/fixtures`;
}
async teardown() {