Skip to content

Commit 67316ec

Browse files
Teamophansl
authored andcommitted
fix(@schematics/angular): remove angularCli in Karma when updating
1 parent 9e97718 commit 67316ec

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

packages/schematics/angular/migrations/update-6/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ function migrateKarmaConfiguration(config: CliConfig): Rule {
7878
content = content.replace(`{ pattern: './src/test.ts', watched: false }`, '');
7979
content = content.replace(`'./src/test.ts': ['@angular/cli'],`, '');
8080
content = content.replace(`'./src/test.ts': ['@angular/cli']`, '');
81+
content = content.replace(/angularCli[^}]*},?/, '');
8182
// Replace 1.x plugin names.
8283
content = content.replace(/@angular\/cli/g, '@angular-devkit/build-angular');
8384
// Replace code coverage output path.

packages/schematics/angular/migrations/update-6/index_spec.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -682,13 +682,17 @@ describe('Migration to v6', () => {
682682
preprocessors: {
683683
'./src/test.ts': ['@angular/cli']
684684
},
685+
angularCli: {
686+
environment: 'dev'
687+
},
685688
`);
686689

687690
tree.create(oldConfigPath, JSON.stringify(baseConfig, null, 2));
688691
tree = schematicRunner.runSchematic('migration-01', defaultOptions, tree);
689692
const content = tree.readContent(karmaPath);
690693
expect(content).not.toContain(`{ pattern: './src/test.ts', watched: false }`);
691694
expect(content).not.toContain(`'./src/test.ts': ['@angular/cli']`);
695+
expect(content).not.toMatch(/angularCli[^}]*},?/);
692696
});
693697
});
694698

0 commit comments

Comments
 (0)