feat(@angular/cli): support test using ngSummaries

angular · Oct 11, 2017 · e022cce · e022cce
1 parent 4b29400
commit e022cce
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/packages/@angular/cli/commands/test.ts b/packages/@angular/cli/commands/test.ts
@@ -54,6 +54,11 @@ const TestCommand = Command.extend({
       description: oneLine`Use a specific config file.
         Defaults to the karma config file in .angular-cli.json.`
     },
+    {
+      name: 'aot',
+      type: Boolean,
+      description: 'Build using Ahead of Time compilation.'
+    },
     {
       name: 'single-run',
       type: Boolean,

diff --git a/packages/@angular/cli/models/webpack-configs/typescript.ts b/packages/@angular/cli/models/webpack-configs/typescript.ts
@@ -146,7 +146,8 @@ export function getAotConfig(wco: WebpackConfigOptions) {
 }
 
 export function getNonAotTestConfig(wco: WebpackConfigOptions) {
-  const { projectRoot, appConfig } = wco;
+  const { projectRoot, appConfig, buildOptions } = wco;
+  const { aot } = buildOptions;
   const tsConfigPath = path.resolve(projectRoot, appConfig.root, appConfig.testTsconfig);
   const appTsConfigPath = path.resolve(projectRoot, appConfig.root, appConfig.tsconfig);
 
@@ -155,7 +156,8 @@ export function getNonAotTestConfig(wco: WebpackConfigOptions) {
   // since TS compilation there is stricter and tsconfig.spec.ts doesn't include them.
   const include = [appConfig.main, appConfig.polyfills];
 
-  let pluginOptions: any = { tsConfigPath, skipCodeGeneration: true, include };
+  let pluginOptions: any = { tsConfigPath, skipCodeGeneration: !aot,
+    enableSummariesForJit: aot, include };
 
   // Fallback to correct module format on projects using a shared tsconfig.
   if (tsConfigPath === appTsConfigPath) {

diff --git a/packages/@angular/cli/plugins/karma.ts b/packages/@angular/cli/plugins/karma.ts
@@ -55,6 +55,7 @@ const init: any = (config: any, emitter: any, customFileHandlers: any) => {
     sourcemaps: true,
     progress: true,
     preserveSymlinks: false,
+    aot: config.aot,
   }, config.angularCli);
 
   if (testConfig.sourcemaps) {