chore(testapp): upgrade to angular2 rc4 (angular#3304)

* upgrade to angular2 rc4 * increase allScriptsTimeout and getPageTimeout for the angular 2 test
eileenzheng · Jul 1, 2016 · 23aabb8 · 23aabb8
1 parent e786ea1
commit 23aabb8
Show file tree

Hide file tree

Showing 27 changed files with 189 additions and 111 deletions.
diff --git a/scripts/test_on_travis.sh b/scripts/test_on_travis.sh
@@ -7,7 +7,7 @@ elif [ $JOB = "full" ]; then
   node bin/protractor spec/ciFullConf.js
   if [ $? = "0" ]; then
     node bin/protractor spec/ciNg2Conf.js
-  else 
+  else
   	exit 1
   fi
 elif [ $JOB = "bstack" ]; then

diff --git a/spec/angular2Conf.js b/spec/angular2Conf.js
@@ -27,9 +27,14 @@ exports.config = {
   // on the page. This means that Protractor will wait for every app to be
   // stable before each action, and search within all apps when finding
   // elements.
-  useAllAngular2AppRoots: true
+  useAllAngular2AppRoots: true,
 
   // Alternatively, you could specify one root element application, to test
   // against only that one:
   // rootElement: 'async-app'
+  allScriptsTimeout: 120000,
+  getPageTimeout: 120000,
+  jasmineNodeOpts: {
+    defaultTimeoutInterval: 120000
+  }
 };
diff --git a/testapp/.gitignore b/testapp/.gitignore
@@ -0,0 +1 @@
+*.js.map
diff --git a/testapp/index.html b/testapp/index.html
@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="en" ng-app="myApp">
+<html lang="en">
   <head>
     <meta charset="utf-8">
     <title>My AngularJS App</title>

diff --git a/testapp/ng2/app/app-router.html → testapp/ng2/app/app.component.html b/testapp/ng2/app/app-router.html → testapp/ng2/app/app.component.html
@@ -1,8 +1,8 @@
 <div class="container">
   <h1 class="title">Test App for Angular 2</h1>
   <nav class="nav">
-    <a [routerLink]="['Home']">home</a>
-    <a [routerLink]="['Async']">async</a>
+    <a [routerLink]="['/']">home</a>
+    <a [routerLink]="['/async']">async</a>
   </nav>
   <router-outlet></router-outlet>
 </div>
diff --git a/testapp/ng2/app/app.router.js → testapp/ng2/app/app.component.js b/testapp/ng2/app/app.router.js → testapp/ng2/app/app.component.js
diff --git a/testapp/ng2/app/app.component.ts b/testapp/ng2/app/app.component.ts
@@ -0,0 +1,11 @@
+import { Component } from '@angular/core';
+import { ROUTER_DIRECTIVES } from '@angular/router';
+
+@Component({
+  selector: 'my-app',
+  templateUrl: 'app/app.component.html',
+  directives: [ ROUTER_DIRECTIVES ]
+})
+export class AppComponent {
+
+}
diff --git a/testapp/ng2/app/app.router.js.map b/testapp/ng2/app/app.router.js.map
diff --git a/testapp/ng2/app/app.router.ts b/testapp/ng2/app/app.router.ts
diff --git a/testapp/ng2/app/app.routes.js b/testapp/ng2/app/app.routes.js
diff --git a/testapp/ng2/app/app.routes.ts b/testapp/ng2/app/app.routes.ts
@@ -0,0 +1,12 @@
+import { provideRouter, RouterConfig } from '@angular/router';
+import { HomeComponent } from './home/home.component';
+import { AsyncComponent } from './async/async.component';
+
+export const routes: RouterConfig = [
+  { path: '', component: HomeComponent },
+  { path: 'async', component: AsyncComponent }
+];
+
+export const APP_ROUTER_PROVIDERS = [
+  provideRouter(routes)
+]
diff --git a/testapp/ng2/app/async/async-component.html → testapp/ng2/app/async/async.component.html b/testapp/ng2/app/async/async-component.html → testapp/ng2/app/async/async.component.html
diff --git a/testapp/ng2/app/async/async.component.js b/testapp/ng2/app/async/async.component.js
diff --git a/testapp/ng2/app/async/async.component.js.map b/testapp/ng2/app/async/async.component.js.map
diff --git a/testapp/ng2/app/async/async.component.ts b/testapp/ng2/app/async/async.component.ts
@@ -1,9 +1,8 @@
-import {bootstrap} from 'angular2/bootstrap';
-import {Component, NgZone} from 'angular2/core';
-import {NgIf} from 'angular2/common';
+import { Component, NgZone } from '@angular/core';
+import { NgIf } from '@angular/common';
 
 @Component({
-  templateUrl: 'app/async/async-component.html',
+  templateUrl: 'app/async/async.component.html',
   directives: [NgIf]
 })
 export class AsyncComponent {

diff --git a/testapp/ng2/app/boot.js b/testapp/ng2/app/boot.js
diff --git a/testapp/ng2/app/boot.js.map b/testapp/ng2/app/boot.js.map
diff --git a/testapp/ng2/app/boot.ts b/testapp/ng2/app/boot.ts
diff --git a/testapp/ng2/app/home/home-component.html → testapp/ng2/app/home/home.component.html b/testapp/ng2/app/home/home-component.html → testapp/ng2/app/home/home.component.html
diff --git a/testapp/ng2/app/home/home.component.js b/testapp/ng2/app/home/home.component.js
diff --git a/testapp/ng2/app/home/home.component.ts b/testapp/ng2/app/home/home.component.ts
@@ -1,8 +1,8 @@
-import {Component} from 'angular2/core';
+import { Component } from '@angular/core';
 
 @Component({
-  templateUrl: 'app/home/home-component.html'
+  templateUrl: 'app/home/home.component.html'
 })
 export class HomeComponent {
-  
+
 }
diff --git a/testapp/ng2/app/main.js b/testapp/ng2/app/main.js
diff --git a/testapp/ng2/app/main.ts b/testapp/ng2/app/main.ts
@@ -0,0 +1,11 @@
+import { bootstrap } from '@angular/platform-browser-dynamic';
+import { provide } from '@angular/core';
+import { HashLocationStrategy, LocationStrategy } from '@angular/common';
+import { AppComponent } from './app.component';
+import { APP_ROUTER_PROVIDERS } from './app.routes';
+
+bootstrap(AppComponent, [
+  APP_ROUTER_PROVIDERS,
+  provide(LocationStrategy, {useClass: HashLocationStrategy})
+])
+.catch(err => console.error(err));
diff --git a/testapp/ng2/index.html b/testapp/ng2/index.html
@@ -8,25 +8,20 @@
     <link href="https://fonts.googleapis.com/css?family=Roboto:400,300,500,400italic,700" rel="stylesheet" type="text/css">
     <link rel="stylesheet" href="styles.css">
     <!-- IE required polyfills, in this exact order -->
-    <script src="../node_modules/es6-shim/es6-shim.min.js"></script>
+    <script src="../node_modules/core-js/client/shim.min.js"></script>
+    <script src="../node_modules/reflect-metadata/Reflect.js"></script>
     <script src="../node_modules/systemjs/dist/system-polyfills.js"></script>
-    <script src="../node_modules/angular2/bundles/angular2-polyfills.js"></script>
-    <script src="../node_modules/systemjs/dist/system.js"></script>
-    <script src="../node_modules/typescript/lib/typescript.js"></script>
-    <script src="../node_modules/rxjs/bundles/Rx.js"></script>
-    <script src="../node_modules/angular2/bundles/angular2.dev.js"></script>
-
-    <!-- Add the router library -->
-    <script src="../node_modules/angular2/bundles/router.js"></script>
+    <script src="../node_modules/systemjs/dist/system.src.js"></script>
+    <script src="../node_modules/zone.js/dist/zone.js"></script>
 
     <script>
-      System.config({
-        transpiler: 'typescript',
-        typescriptOptions: { emitDecoratorMetadata: true },
-        packages: {'app': {defaultExtension: 'ts'}}
+      System.import('system-config.js').then(function() {
+        System.import('app/main');
+      }).catch(function(err) {
+        console.log('error while importing');
+        console.log(err);
+        console.log(err.stack);
       });
-      System.import('app/boot')
-            .then(null, console.error.bind(console));
     </script>
   </head>
 

diff --git a/testapp/ng2/system-config.js b/testapp/ng2/system-config.js
@@ -0,0 +1,39 @@
+System.config({
+  map: {
+    'rxjs': '/node_modules/rxjs',
+    '@angular': '/node_modules/@angular'
+  },
+  packages: {
+    'app': {
+      main: 'boot.js',
+      defaultExtension: 'js'
+    },
+    '@angular/core': {
+      main: 'index.js',
+      defaultExtension: 'js'
+    },
+    '@angular/compiler': {
+      main: 'index.js',
+      defaultExtension: 'js'
+    },
+    '@angular/common': {
+      main: 'index.js',
+      defaultExtension: 'js'
+    },
+    '@angular/platform-browser': {
+      main: 'index.js',
+      defaultExtension: 'js'
+    },
+    '@angular/platform-browser-dynamic': {
+      main: 'index.js',
+      defaultExtension: 'js'
+    },
+    '@angular/router': {
+      main: 'index.js',
+      defaultExtension: 'js'
+    },
+    'rxjs': {
+      defaultExtension: 'js'
+    }
+  }
+});