Skip to content

fix(test): add build environment to karma #2074

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
filipesilva merged 2 commits into from
Sep 13, 2016
Merged

fix(test): add build environment to karma #2074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3180834
fix(test): add build environment to karma
filipesilva Sep 12, 2016
fc1af91
Merge branch 'master' into karma-env
filipesilva Sep 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion packages/angular-cli/blueprints/ng2/files/karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ module.exports = function (config) {
lcovonly: './coverage/coverage.lcov'
}
},
angularCliConfig: './angular-cli.json',
angularCli: {
config: './angular-cli.json',
environment: 'dev'
},
reporters: ['progress', 'karma-remap-istanbul'],
port: 9876,
colors: true,
Expand Down
14 changes: 11 additions & 3 deletions packages/angular-cli/models/webpack-build-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
const path = require('path');
const webpack = require('webpack');

const getWebpackTestConfig = function(projectRoot, appConfig) {
const getWebpackTestConfig = function (projectRoot, environment, appConfig) {

const appRoot = path.resolve(projectRoot, appConfig.root);

return {
Expand Down Expand Up @@ -81,7 +81,15 @@ const getWebpackTestConfig = function(projectRoot, appConfig) {
new webpack.SourceMapDevToolPlugin({
filename: null, // if no value is provided the sourcemap is inlined
test: /\.(ts|js)($|\?)/i // process .js and .ts files only
})
}),
new webpack.NormalModuleReplacementPlugin(
// This plugin is responsible for swapping the environment files.
// Since it takes a RegExp as first parameter, we need to escape the path.
// See https://webpack.github.io/docs/list-of-plugins.html#normalmodulereplacementplugin
new RegExp(path.resolve(appRoot, appConfig.environments['source'])
.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\\$&')),
path.resolve(appRoot, appConfig.environments[environment])
)
],
tslint: {
emitErrors: false,
Expand Down
9 changes: 6 additions & 3 deletions packages/angular-cli/plugins/karma.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,15 @@ const getWebpackTestConfig = require('../models/webpack-build-test').getWebpackT
const init = (config) => {

// load Angular CLI config
if (!config.angularCliConfig) throw new Error('Missing \'angularCliConfig\' entry in Karma config');
const angularCliConfig = require(path.join(config.basePath, config.angularCliConfig));
if (!config.angularCli || !config.angularCli.config) {
throw new Error('Missing \'angularCli.config\' entry in Karma config');
}
const angularCliConfig = require(path.join(config.basePath, config.angularCli.config));
const appConfig = angularCliConfig.apps[0];
const environment = config.angularCli.environment || 'dev';

// add webpack config
config.webpack = getWebpackTestConfig(config.basePath, appConfig);
config.webpack = getWebpackTestConfig(config.basePath, environment, appConfig);
config.webpackMiddleware = {
noInfo: true, // Hide webpack output because its noisy.
stats: { // Also prevent chunk and module display output, cleaner look. Only emit errors.
Expand Down