test fixes

angular · Feb 20, 2017 · 34acb94 · 34acb94
1 parent 46a7f8d
commit 34acb94
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/packages/@angular/cli/models/webpack-xi18n-config.ts b/packages/@angular/cli/models/webpack-xi18n-config.ts
@@ -37,6 +37,6 @@ export class XI18nWebpackConfig extends NgCliWebpackConfig {
         this.extractOptions.i18nFormat);
 
     this.config = webpackMerge([this.config, extractI18nConfig]);
-    return this.config();
+    return this.config;
   }
 }
diff --git a/packages/@angular/cli/tasks/extract-i18n.ts b/packages/@angular/cli/tasks/extract-i18n.ts
@@ -24,7 +24,7 @@ export const Extracti18nTask = Task.extend({
       i18nFormat: runTaskOptions.i18nFormat,
       verbose: runTaskOptions.verbose,
       progress: runTaskOptions.progress
-    }).config;
+    }).buildConfig();
 
     const webpackCompiler = webpack(config);
 

diff --git a/tests/e2e/tests/build/styles/imports.ts b/tests/e2e/tests/build/styles/imports.ts
@@ -1,15 +1,18 @@
 import {
   writeMultipleFiles,
-  deleteFile,
   expectFileToMatch,
   replaceInFile
 } from '../../../utils/fs';
 import { expectToFail } from '../../../utils/utils';
 import { ng } from '../../../utils/process';
 import { stripIndents } from 'common-tags';
 import { updateJsonFile } from '../../../utils/project';
+import { getGlobalVariable } from '../../../utils/env';
 
 export default function () {
+  // Disable parts of it in webpack tests.
+  const ejected = getGlobalVariable('argv').eject;
+
   const extensions = ['css', 'scss', 'less', 'styl'];
   let promise = Promise.resolve();
 
@@ -57,7 +60,7 @@ export default function () {
         .then(() => expectFileToMatch('dist/main.bundle.js',
           /h1.*background:\s*#000+/))
         // Also check imports work on ng test
-        .then(() => ng('test', '--single-run'))
+        .then(() => !ejected && ng('test', '--single-run'))
         // change files back
         .then(() => updateJsonFile('.angular-cli.json', configJson => {
           const app = configJson['apps'][0];