diff --git a/gulpfile.js b/gulpfile.js
index 8e33f962517..5f77a2c6be8 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -355,11 +355,9 @@ gulp.task('copy.libs', function() {
'node_modules/systemjs/node_modules/es6-module-loader/dist/es6-module-loader.src.js', //npm2
'node_modules/es6-module-loader/dist/es6-module-loader.src.js', //npm3
'node_modules/systemjs/dist/system.src.js',
- 'node_modules/angular2/bundles/angular2-polyfills.js',
- 'node_modules/angular2/bundles/angular2.dev.js',
- 'node_modules/angular2/bundles/router.dev.js',
- 'node_modules/angular2/bundles/http.dev.js',
- 'node_modules/rxjs/bundles/Rx.js'
+ 'node_modules/rxjs/bundles/Rx.js',
+ 'node_modules/zone.js/dist/zone.js',
+ 'node_modules/reflect-metadata/Reflect.js'
])
.pipe(gulp.dest('dist/js'));
diff --git a/scripts/e2e/e2e.template.html b/scripts/e2e/e2e.template.html
index fafed50e1a4..ada7ac25d0c 100644
--- a/scripts/e2e/e2e.template.html
+++ b/scripts/e2e/e2e.template.html
@@ -38,55 +38,31 @@
+
+
-
-
-
-
diff --git a/scripts/karma/karma.conf.js b/scripts/karma/karma.conf.js
index 539a36d286d..d7a7365c2f1 100644
--- a/scripts/karma/karma.conf.js
+++ b/scripts/karma/karma.conf.js
@@ -10,17 +10,17 @@ module.exports = function(config) {
frameworks: ['jasmine'],
files: [
+ 'node_modules/es6-shim/es6-shim.min.js',
+
'node_modules/systemjs/node_modules/es6-module-loader/dist/es6-module-loader.js', //npm2
'node_modules/es6-module-loader/dist/es6-module-loader.js', //npm3
+ 'node_modules/reflect-metadata/Reflect.js',
+ 'node_modules/zone.js/dist/zone.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',
- 'node_modules/angular2/bundles/http.min.js',
'node_modules/rxjs/bundles/Rx.min.js',
'dist/bundles/ionic.system.js',
- //'node_modules/angular2/bundles/test_lib.js',
+ { pattern: 'node_modules/@angular/**/*.js', included: false},
{ pattern: 'dist/tests/**/*.spec.js', included: false },
'scripts/karma/test-main.js'
],
diff --git a/scripts/karma/system.config.js b/scripts/karma/system.config.js
index 01c9ac6c5df..1a3cbda8ba7 100644
--- a/scripts/karma/system.config.js
+++ b/scripts/karma/system.config.js
@@ -1,11 +1,60 @@
System.config({
+ baseURL: '/base',
map: {
- 'angular2': '/base/angular2',
- 'ionic-angular': '/base/ionic'
+ 'ionic-angular': 'ionic',
+ '@angular': 'node_modules/@angular',
},
packages: {
'ionic-angular': {
main: 'index'
+ },
+ 'rxjs': {
+ defaultExtension: 'js'
+ },
+ '@angular/core': {
+ main: 'index.js',
+ defaultExtension: 'js'
+ },
+ '@angular/compiler': {
+ main: 'index.js',
+ defaultExtension: 'js'
+ },
+ '@angular/common': {
+ main: 'index.js',
+ defaultExtension: 'js'
+ },
+ // remove after all tests imports are fixed
+ '@angular/facade': {
+ main: 'index.js',
+ defaultExtension: 'js'
+ },
+ '@angular/router': {
+ main: 'index.js',
+ defaultExtension: 'js'
+ },
+ '@angular/router-deprecated': {
+ main: 'index.js',
+ defaultExtension: 'js'
+ },
+ '@angular/http': {
+ main: 'index.js',
+ defaultExtension: 'js'
+ },
+ '@angular/upgrade': {
+ main: 'index.js',
+ defaultExtension: 'js'
+ },
+ '@angular/platform-browser': {
+ main: 'index.js',
+ defaultExtension: 'js'
+ },
+ '@angular/platform-browser-dynamic': {
+ main: 'index.js',
+ defaultExtension: 'js'
+ },
+ '@angular/platform-server': {
+ main: 'index.js',
+ defaultExtension: 'js'
}
}
-});
\ No newline at end of file
+});
diff --git a/scripts/karma/test-main.js b/scripts/karma/test-main.js
index 85a3701cfd1..b88aa8afc19 100644
--- a/scripts/karma/test-main.js
+++ b/scripts/karma/test-main.js
@@ -4,8 +4,13 @@ jasmine.DEFAULT_TIMEOUT_INTERVAL = 50;
// we will call `__karma__.start()` later, once all the specs are loaded.
__karma__.loaded = function() {};
-System.import('angular2/src/platform/browser/browser_adapter').then(function(browser_adapter) {
- browser_adapter.BrowserDomAdapter.makeCurrent();
+System.import('@angular/core/testing').then(function(coreTesting) {
+ return System.import('@angular/platform-browser-dynamic/testing').then(function(browserTesting) {
+ coreTesting.setBaseTestProviders(
+ browserTesting.TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS,
+ browserTesting.TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS
+ );
+ });
}).then(function() {
return Promise.all(
Object.keys(window.__karma__.files) // All files served by Karma.