diff options
Diffstat (limited to 'config')
-rw-r--r-- | config/karma.config.js | 34 | ||||
-rw-r--r-- | config/routes/group.rb | 1 | ||||
-rw-r--r-- | config/webpack.config.js | 4 |
3 files changed, 15 insertions, 24 deletions
diff --git a/config/karma.config.js b/config/karma.config.js index c30c58edc6f..1d6ff797a29 100644 --- a/config/karma.config.js +++ b/config/karma.config.js @@ -6,7 +6,6 @@ const argumentsParser = require('commander'); const webpackConfig = require('./webpack.config.js'); const ROOT_PATH = path.resolve(__dirname, '..'); -const SPECS_PATH = /^(?:\.[\\\/])?(ee[\\\/])?spec[\\\/]javascripts[\\\/]/; function fatalError(message) { console.error(chalk.red(`\nError: ${message}\n`)); @@ -42,19 +41,9 @@ const specFilters = argumentsParser ) .parse(process.argv).filterSpec; -const createContext = (specFiles, regex, suffix) => { - const newContext = specFiles.reduce((context, file) => { - const relativePath = file.replace(SPECS_PATH, ''); - context[file] = `./${relativePath}`; - return context; - }, {}); - - webpackConfig.plugins.push( - new webpack.ContextReplacementPlugin(regex, path.join(ROOT_PATH, suffix), newContext), - ); -}; - if (specFilters.length) { + const specsPath = /^(?:\.[\\\/])?spec[\\\/]javascripts[\\\/]/; + // resolve filters let filteredSpecFiles = specFilters.map(filter => glob @@ -75,15 +64,23 @@ if (specFilters.length) { fatalError('Your filter did not match any test files.'); } - if (!filteredSpecFiles.every(file => SPECS_PATH.test(file))) { + if (!filteredSpecFiles.every(file => specsPath.test(file))) { fatalError('Test files must be located within /spec/javascripts.'); } - const CE_FILES = filteredSpecFiles.filter(file => !file.startsWith('ee')); - createContext(CE_FILES, /[^e]{2}[\\\/]spec[\\\/]javascripts$/, 'spec/javascripts'); + const newContext = filteredSpecFiles.reduce((context, file) => { + const relativePath = file.replace(specsPath, ''); + context[file] = `./${relativePath}`; + return context; + }, {}); - const EE_FILES = filteredSpecFiles.filter(file => file.startsWith('ee')); - createContext(EE_FILES, /ee[\\\/]spec[\\\/]javascripts$/, 'ee/spec/javascripts'); + webpackConfig.plugins.push( + new webpack.ContextReplacementPlugin( + /spec[\\\/]javascripts$/, + path.join(ROOT_PATH, 'spec/javascripts'), + newContext, + ), + ); } // Karma configuration @@ -114,7 +111,6 @@ module.exports = function(config) { ], preprocessors: { 'spec/javascripts/**/*.js': ['webpack', 'sourcemap'], - 'ee/spec/javascripts/**/*.js': ['webpack', 'sourcemap'], }, reporters: ['mocha'], webpack: webpackConfig, diff --git a/config/routes/group.rb b/config/routes/group.rb index b300fcb757f..f42c1ee6e7d 100644 --- a/config/routes/group.rb +++ b/config/routes/group.rb @@ -14,7 +14,6 @@ constraints(::Constraints::GroupUrlConstrainer.new) do get :issues, as: :issues_group get :merge_requests, as: :merge_requests_group get :projects, as: :projects_group - get :details, as: :details_group get :activity, as: :activity_group put :transfer, as: :transfer_group # TODO: Remove as part of refactor in https://gitlab.com/gitlab-org/gitlab-ce/issues/49693 diff --git a/config/webpack.config.js b/config/webpack.config.js index 20b3f4c0264..55122e341c3 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -324,10 +324,6 @@ module.exports = { reportFilename: path.join(ROOT_PATH, 'webpack-report/index.html'), statsFilename: path.join(ROOT_PATH, 'webpack-report/stats.json'), }), - - new webpack.DefinePlugin({ - 'process.env.EE': JSON.stringify(IS_EE), - }), ].filter(Boolean), devServer: { |