GitLab wurde aktualisiert. Dank regelmäßiger Updates bleibt das THM GitLab sicher und Sie profitieren von den neuesten Funktionen. Vielen Dank für Ihre Geduld.

Commit 36ecc88d authored by Filipa Lacerda's avatar Filipa Lacerda
Browse files

Merge branch 'winh-jest-gon' into 'master'

Set gon.ee in Jest

Closes #59634

See merge request gitlab-org/gitlab-ce!26713
parents 7ae35d0a 63f6fcd0
......@@ -9,5 +9,6 @@
/scripts/
/tmp/
/vendor/
jest.config.js
karma.config.js
webpack.config.js
const fs = require('fs');
const path = require('path');
const ROOT_PATH = path.resolve(__dirname, '../..');
module.exports =
process.env.EE !== undefined
? JSON.parse(process.env.EE)
: fs.existsSync(path.join(ROOT_PATH, 'ee'));
const fs = require('fs');
const path = require('path');
const glob = require('glob');
const webpack = require('webpack');
......@@ -12,10 +11,7 @@ const ROOT_PATH = path.resolve(__dirname, '..');
const CACHE_PATH = process.env.WEBPACK_CACHE_PATH || path.join(ROOT_PATH, 'tmp/cache');
const IS_PRODUCTION = process.env.NODE_ENV === 'production';
const IS_DEV_SERVER = process.argv.join(' ').indexOf('webpack-dev-server') !== -1;
const IS_EE =
process.env.EE !== undefined
? JSON.parse(process.env.EE)
: fs.existsSync(path.join(ROOT_PATH, 'ee'));
const IS_EE = require('./helpers/is_ee_env');
const DEV_SERVER_HOST = process.env.DEV_SERVER_HOST || 'localhost';
const DEV_SERVER_PORT = parseInt(process.env.DEV_SERVER_PORT, 10) || 3808;
const DEV_SERVER_LIVERELOAD = IS_DEV_SERVER && process.env.DEV_SERVER_LIVERELOAD !== 'false';
......
/* eslint-disable filenames/match-regex */
const IS_EE = require('./config/helpers/is_ee_env');
const reporters = ['default'];
......@@ -38,4 +38,7 @@ module.exports = {
transformIgnorePatterns: ['node_modules/(?!(@gitlab/ui)/)'],
timers: 'fake',
testEnvironment: '<rootDir>/spec/frontend/environment.js',
testEnvironmentOptions: {
IS_EE,
},
};
......@@ -6,6 +6,7 @@ const JSDOMEnvironment = require('jest-environment-jsdom');
class CustomEnvironment extends JSDOMEnvironment {
constructor(config, context) {
super(config, context);
Object.assign(context.console, {
error(...args) {
throw new ErrorWithStack(
......@@ -21,6 +22,11 @@ class CustomEnvironment extends JSDOMEnvironment {
);
},
});
const { testEnvironmentOptions } = config;
this.global.gon = {
ee: testEnvironmentOptions.IS_EE,
};
}
}
......
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