chore: move test config files to config dir.

Author: hansl

addon/ng2/blueprints/ng2/files/angular-cli.json

@@ -10,12 +10,12 @@
   "packages": [],
   "e2e": {
     "protractor": {
-      "config": "protractor.conf.js"
+      "config": "config/protractor.conf.js"
     }
   },
   "test": {
     "karma": {
-      "config": "karma.conf.js"
+      "config": "config/karma.conf.js"
     }
   },
   "defaults": {

addon/ng2/blueprints/ng2/files/karma-test-shim.js renamed to addon/ng2/blueprints/ng2/files/config/karma-test-shim.js

@@ -1,6 +1,6 @@
 module.exports = function (config) {
   config.set({
-    basePath: '',
+    basePath: '..',
     frameworks: ['jasmine'],
     plugins: [
       require('karma-jasmine'),
@@ -26,8 +26,7 @@ module.exports = function (config) {
       { pattern: 'node_modules/angular2/bundles/router.dev.js', included: true, watched: true },
       { pattern: 'node_modules/angular2/bundles/testing.dev.js', included: true, watched: true },
 
-
-      { pattern: 'karma-test-shim.js', included: true, watched: true },
+      { pattern: 'config/karma-test-shim.js', included: true, watched: true },
 
       // paths loaded via module imports
       { pattern: 'dist/**/*.js', included: false, watched: true },

addon/ng2/blueprints/ng2/files/karma.conf.js renamed to addon/ng2/blueprints/ng2/files/config/karma.conf.js

@@ -4,7 +4,7 @@ var SpecReporter = require('jasmine-spec-reporter');
 exports.config = {
   allScriptsTimeout: 11000,
   specs: [
-    'e2e/**/*.e2e.ts'
+    '../e2e/**/*.e2e.ts'
   ],
   capabilities: {
     'browserName': 'chrome'

addon/ng2/blueprints/ng2/files/protractor.conf.js renamed to addon/ng2/blueprints/ng2/files/config/protractor.conf.js

@@ -2,13 +2,16 @@
 'use strict';
 
 var Command = require('ember-cli/lib/models/command');
+const config = require('../models/config');
 var E2ETask = require('../tasks/e2e');
 
 module.exports = Command.extend({
   name: 'e2e',
   description: 'Run e2e tests in existing project',
   works: 'insideProject',
   run: function () {
+    this.project.ngConfig = this.project.ngConfig || config.CliConfig.fromProject();
+
     var e2eTask = new E2ETask({
       ui: this.ui,
       analytics: this.analytics,

addon/ng2/commands/e2e.js

@@ -5,6 +5,7 @@ var TestCommand = require('ember-cli/lib/commands/test');
 var win = require('ember-cli/lib/utilities/windows-admin');
 var BuildTask = require('ember-cli/lib/tasks/build');
 var BuildWatchTask = require('ember-cli/lib/tasks/build-watch');
+const config = require('../models/config');
 var TestTask = require('../tasks/test');
 
 
@@ -19,6 +20,8 @@ module.exports = TestCommand.extend({
   ],
 
   run: function (commandOptions) {
+    this.project.ngConfig = this.project.ngConfig || config.CliConfig.fromProject();
+
     var buildWatchTask =
       new BuildWatchTask({
         ui: this.ui,

addon/ng2/commands/test.js

@@ -7,6 +7,6 @@ var exec = Promise.denodeify(require('shelljs').exec);
 
 module.exports = Task.extend({
   run: function () {
-    return exec('npm run e2e');
+    return exec(`npm run e2e -- ${this.project.ngConfig.e2e.protractor.config}`);
   }
 });

addon/ng2/tasks/e2e.js

@@ -16,9 +16,9 @@ module.exports = Task.extend({
 
   run: function (options) {
     var projectRoot = this.project.root;
-    return new Promise(function (resolve) {
+    return new Promise((resolve) => {
       var karma = requireDependency(projectRoot, 'karma');
-      var karmaConfig = path.join(projectRoot, 'karma.conf');
+      var karmaConfig = path.join(projectRoot, this.project.ngConfig.test.karma.config);
 
       // Convert browsers from a string to an array
       if (options.browsers) {