refactor(tests): Refactor e2e tests entirely.

.appveyor.yml

@@ -11,5 +11,6 @@ test_script:
   - node --version
   - npm --version
   - npm test
+  - npm run test:e2e
 
 build: off

.travis.yml

@@ -13,15 +13,22 @@ env:
   matrix:
     - SCRIPT=lint
 #    - SCRIPT=build
+    - SCRIPT=e2e
+    - SCRIPT=e2e:nightly
     - SCRIPT=test
 #    - TARGET=mobile SCRIPT=mobile_test
 matrix:
   fast_finish: true
   allow_failures:
     - os: osx
+    - env: SCRIPT=e2e:nightly
   exclude:
     - node_js: "6"
       env: SCRIPT=lint
+    - os: osx
+      env: SCRIPT=e2e:nightly
+    - node_js: "6"
+      env: SCRIPT=e2e:nightly
     - os: osx
       node_js: "5"
       env: SCRIPT=lint

addon/ng2/blueprints/component/index.js

@@ -2,7 +2,7 @@ var path = require('path');
 var chalk = require('chalk');
 var Blueprint = require('ember-cli/lib/models/blueprint');
 var dynamicPathParser = require('../../utilities/dynamic-path-parser');
-const findParentModule = require('../../utilities/find-parent-module');
+const findParentModule = require('../../utilities/find-parent-module').default;
 var getFiles = Blueprint.prototype.files;
 const stringUtils = require('ember-cli-string-utils');
 const astUtils = require('../../utilities/ast-utils');
@@ -111,12 +111,12 @@ module.exports = {
     const returns = [];
     const className = stringUtils.classify(`${options.entity.name}Component`);
     const fileName = stringUtils.dasherize(`${options.entity.name}.component`);
-    const componentDir = path.relative(this.dynamicPath.appRoot, this.generatePath);
+    const componentDir = path.relative(path.dirname(this.pathToModule), this.generatePath);
     const importPath = componentDir ? `./${componentDir}/${fileName}` : `./${fileName}`;
 
     if (!options['skip-import']) {
       returns.push(
-        astUtils.addComponentToModule(this.pathToModule, className, importPath)
+        astUtils.addDeclarationToModule(this.pathToModule, className, importPath)
           .then(change => change.apply()));
     }
 

addon/ng2/blueprints/directive/index.js

@@ -2,7 +2,7 @@ var path = require('path');
 var dynamicPathParser = require('../../utilities/dynamic-path-parser');
 const stringUtils = require('ember-cli-string-utils');
 const astUtils = require('../../utilities/ast-utils');
-const findParentModule = require('../../utilities/find-parent-module');
+const findParentModule = require('../../utilities/find-parent-module').default;
 
 module.exports = {
   description: '',
@@ -72,7 +72,7 @@ module.exports = {
 
     if (!options['skip-import']) {
       returns.push(
-        astUtils.addComponentToModule(this.pathToModule, className, importPath)
+        astUtils.addDeclarationToModule(this.pathToModule, className, importPath)
           .then(change => change.apply()));
     }
 

addon/ng2/blueprints/ng2/index.js

@@ -21,7 +21,7 @@ module.exports = {
 
   locals: function(options) {
     this.styleExt = options.style;
-    this.version = require(path.resolve(__dirname, '..', '..', '..', '..', 'package.json')).version;
+    this.version = require(path.resolve(__dirname, '../../../../package.json')).version;
 
     // Join with / not path.sep as reference to typings require forward slashes.
     const relativeRootPath = options.sourceDir.split(path.sep).map(() => '..').join('/');
@@ -44,12 +44,11 @@ module.exports = {
 
   files: function() {
     var fileList = getFiles.call(this);
-
     if (this.options && this.options.mobile) {
       fileList = fileList.filter(p => p.indexOf('__name__.component.html') < 0);
       fileList = fileList.filter(p => p.indexOf('__name__.component.__styleext__') < 0);
     }
-    
+
     return fileList;
   },
 

addon/ng2/blueprints/pipe/index.js

@@ -2,7 +2,7 @@ var path = require('path');
 var dynamicPathParser = require('../../utilities/dynamic-path-parser');
 const stringUtils = require('ember-cli-string-utils');
 const astUtils = require('../../utilities/ast-utils');
-const findParentModule = require('../../utilities/find-parent-module');
+const findParentModule = require('../../utilities/find-parent-module').default;
 
 module.exports = {
   description: '',
@@ -60,7 +60,7 @@ module.exports = {
 
     if (!options['skip-import']) {
       returns.push(
-        astUtils.addComponentToModule(this.pathToModule, className, importPath)
+        astUtils.addDeclarationToModule(this.pathToModule, className, importPath)
           .then(change => change.apply()));
     }
 

addon/ng2/commands/init.ts

@@ -1,5 +1,3 @@
-'use strict';
-
 import LinkCli from '../tasks/link-cli';
 
 const Command = require('ember-cli/lib/models/command');

addon/ng2/models/find-lazy-modules.ts

@@ -57,7 +57,10 @@ export function findLazyModules(projectRoot: any): string[] {
       findLoadChildren(tsPath).forEach(moduleName => {
         const fileName = path.resolve(path.dirname(tsPath), moduleName) + '.ts';
         if (fs.existsSync(fileName)) {
-          result[moduleName] = true;
+          // Put the moduleName as relative to the main.ts.
+          const fullPath = path.resolve(path.dirname(tsPath), moduleName);
+          const name = `./${path.relative(projectRoot, fullPath)}.ts`;
+          result[name] = true;
         }
       });
     });

addon/ng2/utilities/ast-utils.ts

@@ -7,6 +7,6 @@ export {
   insertAfterLastOccurrence,
   getContentOfKeyLiteral,
   getDecoratorMetadata,
-  addComponentToModule,
+  addDeclarationToModule,
   addProviderToModule
 } from '@angular-cli/ast-tools';

addon/ng2/utilities/find-parent-module.ts

@@ -2,8 +2,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 const SilentError = require('silent-error');
 
-module.exports = function findParentModule(project: any, currentDir: string): string {
-
+export default function findParentModule(project: any, currentDir: string): string {
   const sourceRoot = path.join(project.root, project.ngConfig.apps[0].root, 'app');
 
   // trim currentDir

lib/bootstrap-local.js

@@ -24,7 +24,7 @@ require.extensions['.ts'] = function(m, filename) {
   const source = fs.readFileSync(filename).toString();
 
   try {
-    const result = ts.transpile(source, compilerOptions);
+    const result = ts.transpile(source, compilerOptions['compilerOptions']);
 
     // Send it to node to execute.
     return m._compile(result, filename);