remove test file if present

Author: filipesilva

packages/@angular/cli/plugins/karma.ts

@@ -102,45 +102,33 @@ const init: any = (config: any, emitter: any, customFileHandlers: any) => {
     webpackConfig.plugins.push(new KarmaWebpackThrowError());
   }
 
+  // Use existing config if any.
   config.webpack = Object.assign(webpackConfig, config.webpack);
   config.webpackMiddleware = Object.assign(webpackMiddlewareConfig, config.webpackMiddleware);
 
-  // Replace the @angular/cli preprocessor with webpack+sourcemap.
-  Object.keys(config.preprocessors)
-    .filter((file) => config.preprocessors[file].indexOf('@angular/cli') !== -1)
-    .map((file) => config.preprocessors[file])
-    .map((arr) => arr.splice(arr.indexOf('@angular/cli'), 1, 'webpack', 'sourcemap'));
-
-  config.customContextFile = `${__dirname}/karma-context.html`;
-  config.customDebugFile = `${__dirname}/karma-debug.html`;
-
-  config.files.forEach((file: any) => {
-    if (file.pattern === `./${appConfig.root}/${appConfig.test}`) {
-      file.watched = false;
-      file.served = false;
-      file.included = false;
+  // Remove the @angular/cli test file if present, for backwards compatibility.
+  const testFilePath = path.join(appRoot, appConfig.test);
+  config.files.forEach((file: any, index: number) => {
+    if (path.normalize(file.pattern) === testFilePath) {
+      config.files.splice(index, 1);
     }
   });
 
+  // Our custom context and debug files list the webpack bundles directly instead of using
+  // the karma files array.
+  config.customContextFile = `${__dirname}/karma-context.html`;
+  config.customDebugFile = `${__dirname}/karma-debug.html`;
 
-  // Add the blocker.
+  // Add the request blocker.
   config.beforeMiddleware = config.beforeMiddleware || [];
   config.beforeMiddleware.push('angularCliBlocker');
 
-  // code from karma-webpack
-
-  // The webpack tier owns the watch behavior so we want to force it in the config
+  // The webpack tier owns the watch behavior so we want to force it in the config.
   webpackConfig.watch = true;
   // Files need to be served from a custom path for Karma.
   webpackConfig.output.path = '/_karma_webpack_/';
   webpackConfig.output.publicPath = '/_karma_webpack_/';
 
-
-  // webpackConfig.entry = Object.assign({}, {
-  //   scripts: [],
-  //   styles: []
-  // }, webpackConfig.entry)
-
   let compiler: any;
   try {
     compiler = webpack(webpackConfig);