Skip to content

Commit

Permalink
fix(@schematics/angular): codeCoverage exclude is not being migrated (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
alan-agius4 authored and vikerman committed Oct 11, 2018
1 parent 9f7b088 commit fd8cfcb
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 1 deletion.
11 changes: 10 additions & 1 deletion packages/schematics/angular/migrations/update-6/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,16 @@ function extractProjectsConfig(

if (app.testTsconfig) {
testOptions.tsConfig = appRoot + '/' + app.testTsconfig;
}
}

const codeCoverageExclude = config.test
&& config.test.codeCoverage
&& config.test.codeCoverage.exclude;

if (codeCoverageExclude) {
testOptions.codeCoverageExclude = codeCoverageExclude;
}

testOptions.scripts = (app.scripts || []).map(_extraEntryMapper);
testOptions.styles = (app.styles || []).map(_extraEntryMapper);
testOptions.assets = (app.assets || []).map(_mapAssets).filter(x => !!x);
Expand Down
6 changes: 6 additions & 0 deletions packages/schematics/angular/migrations/update-6/index_spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,11 @@ describe('Migration to v6', () => {
karma: {
config: './karma.conf.js',
},
codeCoverage: {
exclude: [
'./excluded.spec.ts',
],
},
},
defaults: {
styleExt: 'css',
Expand Down Expand Up @@ -657,6 +662,7 @@ describe('Migration to v6', () => {
expect(test.options.polyfills).toEqual('src/polyfills.ts');
expect(test.options.tsConfig).toEqual('src/tsconfig.spec.json');
expect(test.options.karmaConfig).toEqual('./karma.conf.js');
expect(test.options.codeCoverageExclude).toEqual(['./excluded.spec.ts']);
expect(test.options.scripts).toEqual([]);
expect(test.options.styles).toEqual(['src/styles.css']);
expect(test.options.assets).toEqual([
Expand Down

0 comments on commit fd8cfcb

Please sign in to comment.