diff options
| author | Mike Greiling <mike@pixelcog.com> | 2019-04-05 21:51:50 +0300 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2019-04-05 21:51:50 +0300 |
| commit | 361c7ca69787e75b3ad2c776245452bd49e4a13c (patch) | |
| tree | 22bbed6a0c50cffc6cdc26f314abf9331d7d9c16 /spec | |
| parent | 097b63fcb3bc45a383adedc725729fe9b5dc75a9 (diff) | |
| parent | 64e9cf00a7d889913ae7327695394cac29643f0b (diff) | |
Merge branch 'winh-ee-environment-variable' into 'master'
Rename environment variable EE to IS_GITLAB_EE
Closes #60080
See merge request gitlab-org/gitlab-ce!27044
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/javascripts/test_bundle.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/javascripts/test_bundle.js b/spec/javascripts/test_bundle.js index 235a17d13b0..87ef0885d8c 100644 --- a/spec/javascripts/test_bundle.js +++ b/spec/javascripts/test_bundle.js @@ -69,7 +69,7 @@ window.gl = window.gl || {}; window.gl.TEST_HOST = TEST_HOST; window.gon = window.gon || {}; window.gon.test_env = true; -window.gon.ee = process.env.EE; +window.gon.ee = process.env.IS_GITLAB_EE; gon.relative_url_root = ''; let hasUnhandledPromiseRejections = false; @@ -124,7 +124,7 @@ const axiosDefaultAdapter = getDefaultAdapter(); // render all of our tests const testContexts = [require.context('spec', true, /_spec$/)]; -if (process.env.EE) { +if (process.env.IS_GITLAB_EE) { testContexts.push(require.context('ee_spec', true, /_spec$/)); } @@ -213,7 +213,7 @@ if (process.env.BABEL_ENV === 'coverage') { describe('Uncovered files', function() { const sourceFilesContexts = [require.context('~', true, /\.(js|vue)$/)]; - if (process.env.EE) { + if (process.env.IS_GITLAB_EE) { sourceFilesContexts.push(require.context('ee', true, /\.(js|vue)$/)); } |