Commit 98fecb5f authored by Clement Ho's avatar Clement Ho

Merge branch 'remove-test-bundle' into 'master'

Remove the "test" bundle and apply it conditionally within main.js

See merge request gitlab-org/gitlab-ce!17472
parents e17d8ad8 eefd1743
...@@ -36,8 +36,11 @@ import initBreadcrumbs from './breadcrumb'; ...@@ -36,8 +36,11 @@ import initBreadcrumbs from './breadcrumb';
import initDispatcher from './dispatcher'; import initDispatcher from './dispatcher';
// eslint-disable-next-line global-require, import/no-commonjs // inject test utilities if necessary
if (process.env.NODE_ENV !== 'production') require('./test_utils/'); if (process.env.NODE_ENV !== 'production' && gon && gon.test_env) {
$.fx.off = true;
import(/* webpackMode: "eager" */ './test_utils/');
}
svg4everybody(); svg4everybody();
......
...@@ -42,7 +42,6 @@ ...@@ -42,7 +42,6 @@
= webpack_bundle_tag "common" = webpack_bundle_tag "common"
= webpack_bundle_tag "main" = webpack_bundle_tag "main"
= webpack_bundle_tag "raven" if Gitlab::CurrentSettings.clientside_sentry_enabled = webpack_bundle_tag "raven" if Gitlab::CurrentSettings.clientside_sentry_enabled
= webpack_bundle_tag "test" if Rails.env.test?
- if content_for?(:page_specific_javascripts) - if content_for?(:page_specific_javascripts)
= yield :page_specific_javascripts = yield :page_specific_javascripts
......
...@@ -53,7 +53,6 @@ function generateEntries() { ...@@ -53,7 +53,6 @@ function generateEntries() {
main: './main.js', main: './main.js',
ide: './ide/index.js', ide: './ide/index.js',
raven: './raven/index.js', raven: './raven/index.js',
test: './test.js',
webpack_runtime: './webpack.js', webpack_runtime: './webpack.js',
}; };
......
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