From 8b724a3bcb9ab6f10398d9ed7fb9e3f5f281b41c Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Fri, 12 Feb 2016 13:59:28 -0600
Subject: [PATCH] chore(tests): make typescript and unit tests friends

---
 ionic/components/button/test/button.spec.ts      | 4 +++-
 ionic/components/input/test/text-input.spec.ts   | 4 +++-
 ionic/components/nav/test/nav-controller.spec.ts | 4 +++-
 ionic/components/tap-click/test/tapClick.spec.ts | 2 +-
 ionic/config/test/config.spec.ts                 | 4 +++-
 ionic/platform/test/platform.spec.ts             | 4 +++-
 ionic/util/test/util.spec.ts                     | 4 +++-
 scripts/e2e/e2e.template.html                    | 2 +-
 scripts/karma/karma.conf.js                      | 1 +
 scripts/karma/system.config.js                   | 6 ++++++
 10 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 scripts/karma/system.config.js

diff --git a/ionic/components/button/test/button.spec.ts b/ionic/components/button/test/button.spec.ts
index a7c17093ca..0d284cca96 100644
--- a/ionic/components/button/test/button.spec.ts
+++ b/ionic/components/button/test/button.spec.ts
@@ -1,4 +1,6 @@
-import {Button, Config} from 'ionic/ionic';
+/// <reference path="../../../../node_modules/angular2/typings/jasmine/jasmine.d.ts"/>
+
+import {Button, Config} from '../../../../ionic/ionic';
 
 export function run() {
 
diff --git a/ionic/components/input/test/text-input.spec.ts b/ionic/components/input/test/text-input.spec.ts
index e8bf672c8b..da377f754a 100644
--- a/ionic/components/input/test/text-input.spec.ts
+++ b/ionic/components/input/test/text-input.spec.ts
@@ -1,4 +1,6 @@
-import {TextInput} from 'ionic/ionic';
+/// <reference path="../../../../node_modules/angular2/typings/jasmine/jasmine.d.ts"/>
+
+import {TextInput} from '../../../../ionic/ionic';
 
 export function run() {
 
diff --git a/ionic/components/nav/test/nav-controller.spec.ts b/ionic/components/nav/test/nav-controller.spec.ts
index e842e22a5c..f9973768c5 100644
--- a/ionic/components/nav/test/nav-controller.spec.ts
+++ b/ionic/components/nav/test/nav-controller.spec.ts
@@ -1,4 +1,6 @@
-import {NavController, Config, ViewController} from 'ionic/ionic';
+/// <reference path="../../../../node_modules/angular2/typings/jasmine/jasmine.d.ts"/>
+
+import {NavController, Config, ViewController} from '../../../../ionic/ionic';
 
 export function run() {
   describe('NavController', () => {
diff --git a/ionic/components/tap-click/test/tapClick.spec.ts b/ionic/components/tap-click/test/tapClick.spec.ts
index b275d3d6d6..58f7d64ac7 100644
--- a/ionic/components/tap-click/test/tapClick.spec.ts
+++ b/ionic/components/tap-click/test/tapClick.spec.ts
@@ -1,4 +1,4 @@
-import * as tapClick from 'ionic/ionic';
+import * as tapClick from '../../../../ionic/ionic';
 
 export function run() {
 
diff --git a/ionic/config/test/config.spec.ts b/ionic/config/test/config.spec.ts
index 1c8f4c3ad5..4b4af5105d 100644
--- a/ionic/config/test/config.spec.ts
+++ b/ionic/config/test/config.spec.ts
@@ -1,4 +1,6 @@
-import {Config, Platform, ionicProviders} from 'ionic/ionic';
+/// <reference path="../../../node_modules/angular2/typings/jasmine/jasmine.d.ts"/>
+
+import {Config, Platform, ionicProviders} from '../../../ionic/ionic';
 
 export function run() {
 
diff --git a/ionic/platform/test/platform.spec.ts b/ionic/platform/test/platform.spec.ts
index 374bd6d652..a5e664a2d8 100644
--- a/ionic/platform/test/platform.spec.ts
+++ b/ionic/platform/test/platform.spec.ts
@@ -1,4 +1,6 @@
-import {Platform} from 'ionic/ionic';
+/// <reference path="../../../node_modules/angular2/typings/jasmine/jasmine.d.ts"/>
+
+import {Platform} from '../../../ionic/ionic';
 
 export function run() {
 
diff --git a/ionic/util/test/util.spec.ts b/ionic/util/test/util.spec.ts
index 4b0e0e73b0..efd4423194 100644
--- a/ionic/util/test/util.spec.ts
+++ b/ionic/util/test/util.spec.ts
@@ -1,4 +1,6 @@
-import * as util from 'ionic/util';
+/// <reference path="../../../node_modules/angular2/typings/jasmine/jasmine.d.ts"/>
+
+import * as util from '../../../ionic/util';
 
 export function run() {
   describe('extend', function() {
diff --git a/scripts/e2e/e2e.template.html b/scripts/e2e/e2e.template.html
index 08b91bb9f4..71a6c8c1cd 100644
--- a/scripts/e2e/e2e.template.html
+++ b/scripts/e2e/e2e.template.html
@@ -36,7 +36,7 @@
   <script src="../../../js/es6-shim.min.js"></script>
   <script src="../../../js/es6-module-loader.src.js"></script>
   <script src="../../../js/system.src.js"></script>
-    <script>
+  <script>
     System.config({
       map: {
         angular2: '/angular2',
diff --git a/scripts/karma/karma.conf.js b/scripts/karma/karma.conf.js
index 2a90c1563d..17214bbda3 100644
--- a/scripts/karma/karma.conf.js
+++ b/scripts/karma/karma.conf.js
@@ -10,6 +10,7 @@ module.exports = function(config) {
     files: [
       'node_modules/systemjs/node_modules/es6-module-loader/dist/es6-module-loader.js',
       'node_modules/systemjs/dist/system.js',
+      'scripts/karma/system.config.js',
       'node_modules/angular2/bundles/angular2-polyfills.min.js',
       'node_modules/angular2/bundles/angular2.min.js',
       'node_modules/angular2/bundles/router.min.js',
diff --git a/scripts/karma/system.config.js b/scripts/karma/system.config.js
new file mode 100644
index 0000000000..f505af5f22
--- /dev/null
+++ b/scripts/karma/system.config.js
@@ -0,0 +1,6 @@
+System.config({
+  map: {
+    angular2: '/base/angular2',
+    ionic: '/base/ionic'
+  }
+});
\ No newline at end of file