Fix karma test running with ng test (#31)

* Fix karma test running with `ng test`

* re-add travis config

* re-add missing saucelabs and browserstack configs

* fix protractor path

Author: jelbourn

angular-cli.json

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

config/browser-providers.js renamed to browser-providers.js

@@ -1,4 +1,4 @@
-import { MaterialDocsAppPage } from './app.po';
+import {MaterialDocsAppPage} from './app.po';
 
 describe('angular-io-v42 App', function() {
   let page: MaterialDocsAppPage;

e2e/app.e2e-spec.ts

@@ -1,53 +1,48 @@
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/0.13/config/configuration-file.html
 const {customLaunchers, platformMap} = require('./browser-providers');
 const path = require('path');
 
 module.exports = function (config) {
   config.set({
-
-    basePath: path.join(__dirname, '..'),
-
+    basePath: '',
     frameworks: ['jasmine', 'angular-cli'],
-
     plugins: [
       require('karma-jasmine'),
       require('karma-chrome-launcher'),
       require('karma-remap-istanbul'),
+      require('angular-cli/plugins/karma'),
       require('karma-browserstack-launcher'),
       require('karma-sauce-launcher'),
-      require('angular-cli/plugins/karma')
     ],
-
     files: [
       { pattern: './src/test.ts', watched: false }
     ],
-
     preprocessors: {
       './src/test.ts': ['angular-cli']
     },
-
+    mime: {
+      'text/x-typescript': ['ts','tsx']
+    },
     remapIstanbulReporter: {
       reports: {
         html: 'coverage',
-        lcovonly: '../coverage/coverage.lcov'
+        lcovonly: './coverage/coverage.lcov'
       }
     },
-
     angularCli: {
       config: './angular-cli.json',
       environment: 'dev'
     },
     reporters: config.angularCli && config.angularCli.codeCoverage
               ? ['progress', 'karma-remap-istanbul']
               : ['progress'],
-
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,
     autoWatch: true,
     browsers: ['Chrome'],
     singleRun: false,
-
-    // Custom launchers for Browserstack and Saucelabs.
     customLaunchers: customLaunchers,
 
     sauceLabs: {
@@ -70,9 +65,8 @@ module.exports = function (config) {
       timeout: 600,
       pollingTimeout: 20000
     },
-
   });
-
+  
   if (process.env['TRAVIS']) {
 
     let buildId = `TRAVIS #${process.env.TRAVIS_BUILD_NUMBER} (${process.env.TRAVIS_BUILD_ID})`;
@@ -93,5 +87,5 @@ module.exports = function (config) {
     }
 
     config.browsers = platformMap[platformType];
-  }
+  }  
 };

config/karma.conf.js renamed to karma.conf.js

@@ -16,15 +16,15 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/common": "~2.1.0",
-    "@angular/compiler": "~2.1.0",
-    "@angular/core": "~2.1.0",
-    "@angular/forms": "~2.1.0",
-    "@angular/http": "~2.1.0",
-    "@angular/material": "^2.0.0-alpha.9-3",
-    "@angular/platform-browser": "~2.1.0",
-    "@angular/platform-browser-dynamic": "~2.1.0",
-    "@angular/router": "~3.1.0",
+    "@angular/common": "~2.2.3",
+    "@angular/compiler": "~2.2.3",
+    "@angular/core": "~2.2.3",
+    "@angular/forms": "~2.2.3",
+    "@angular/http": "~2.2.3",
+    "@angular/material": "^2.0.0-alpha.11-3",
+    "@angular/platform-browser": "~2.2.3",
+    "@angular/platform-browser-dynamic": "~2.2.3",
+    "@angular/router": "~3.2.3",
     "core-js": "^2.4.1",
     "fs-extra": "^1.0.0",
     "hapi": "^15.2.0",
@@ -34,9 +34,10 @@
     "zone.js": "^0.6.23"
   },
   "devDependencies": {
+    "@angular/compiler-cli": "~2.2.3",
     "@types/jasmine": "^2.2.30",
     "@types/node": "^6.0.42",
-    "angular-cli": "1.0.0-beta.19-3",
+    "angular-cli": "1.0.0-beta.22-1",
     "codelyzer": "1.0.0-beta.1",
     "jasmine-core": "2.4.1",
     "jasmine-spec-reporter": "2.5.0",
@@ -50,7 +51,7 @@
     "protractor": "4.0.9",
     "ts-node": "1.2.1",
     "tslint": "3.13.0",
-    "typescript": "~2.0.3",
+    "typescript": "~2.0.10",
     "webdriver-manager": "10.2.5"
   }
 }

package.json

@@ -7,7 +7,7 @@ const SpecReporter = require('jasmine-spec-reporter');
 let config = {
   allScriptsTimeout: 11000,
   specs: [
-    '../e2e/**/*.e2e-spec.ts'
+    './e2e/**/*.e2e-spec.ts'
   ],
   capabilities: {
     'browserName': 'chrome'
@@ -45,4 +45,4 @@ if (process.env['TRAVIS']) {
 
 }
 
-exports.config = config;
+exports.config = config;

config/protractor-prerender.conf.js renamed to protractor-prerender.conf.js

@@ -2,9 +2,10 @@ import {Component} from '@angular/core';
 
 
 @Component({
+  moduleId: module.id,
   selector: 'material-docs-app',
-  templateUrl: 'material-docs-app.html',
-  styleUrls: ['material-docs-app.scss'],
+  templateUrl: './material-docs-app.html',
+  styleUrls: ['./material-docs-app.scss'],
   host: {
     '[class.docs-dark-theme]': 'isDarkTheme',
   }

config/protractor.conf.js renamed to protractor.conf.js

@@ -0,0 +1,5 @@
+describe('component list', () => {
+  it('should run', () => {
+    expect(1).toBe(1);
+  });
+});

src/app/material-docs-app.ts

@@ -1,9 +1,10 @@
 import { Component} from '@angular/core';
 
 @Component({
+  moduleId: module.id,
   selector: 'app-components',
-  templateUrl: 'components.html',
-  styleUrls: ['components.scss']
+  templateUrl: './components.html',
+  styleUrls: ['./components.scss']
 })
 export class ComponentsList {
   componentItems = [