fix(@schematics/angular): remove angularCli in Karma when updating

angular · Jun 6, 2018 · 06589b4 · 06589b4
1 parent c84fa4b
commit 06589b4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/packages/schematics/angular/migrations/update-6/index.ts b/packages/schematics/angular/migrations/update-6/index.ts
@@ -78,6 +78,7 @@ function migrateKarmaConfiguration(config: CliConfig): Rule {
         content = content.replace(`{ pattern: './src/test.ts', watched: false }`, '');
         content = content.replace(`'./src/test.ts': ['@angular/cli'],`, '');
         content = content.replace(`'./src/test.ts': ['@angular/cli']`, '');
+        content = content.replace(/angularCli[^}]*},?/, '');
         // Replace 1.x plugin names.
         content = content.replace(/@angular\/cli/g, '@angular-devkit/build-angular');
         // Replace code coverage output path.

diff --git a/packages/schematics/angular/migrations/update-6/index_spec.ts b/packages/schematics/angular/migrations/update-6/index_spec.ts
@@ -682,13 +682,17 @@ describe('Migration to v6', () => {
         preprocessors: {
           './src/test.ts': ['@angular/cli']
         },
+        angularCli: {
+          environment: 'dev'
+        },
       `);
 
       tree.create(oldConfigPath, JSON.stringify(baseConfig, null, 2));
       tree = schematicRunner.runSchematic('migration-01', defaultOptions, tree);
       const content = tree.readContent(karmaPath);
       expect(content).not.toContain(`{ pattern: './src/test.ts', watched: false }`);
       expect(content).not.toContain(`'./src/test.ts': ['@angular/cli']`);
+      expect(content).not.toMatch(/angularCli[^}]*},?/);
     });
   });