test: fixing tests for landing page changes

angular · May 5, 2017 · 173d84b · 173d84b
1 parent 6ae3068
commit 173d84b
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 10 deletions.
diff --git a/packages/@angular/cli/blueprints/ng/files/__path__/app/app.component.html b/packages/@angular/cli/blueprints/ng/files/__path__/app/app.component.html
@@ -1,3 +1,4 @@
+<!--The whole content below can be removed with the new code.-->
 <div style="text-align:center">
   <h1>
     Welcome to {{title}}!!

diff --git a/tests/e2e/tests/build/assets.ts b/tests/e2e/tests/build/assets.ts
@@ -132,7 +132,6 @@ export default function () {
           });
         });`,
     }))
-    // .then(() => !ejected && ng('test', '--single-run'))
-    // .then(_ => killAllProcesses(), (err) => { killAllProcesses(); throw err; })
-    .then(() => ng('e2e'));
+    .then(() => !ejected && ng('test', '--single-run'))
+    .then(() => !ejected && ng('e2e'));
 }
diff --git a/tests/e2e/tests/misc/default-port.ts b/tests/e2e/tests/misc/default-port.ts
@@ -12,7 +12,7 @@ export default function() {
     .then(() => ngServe())
     .then(() => request('http://localhost:4201/'))
     .then(body => {
-      if (!body.match(/<app-root>Loading...<\/app-root>/)) {
+      if (!body.match(/<app-root><\/app-root>/)) {
         throw new Error('Response does not match expected value.');
       }
     })

diff --git a/tests/e2e/tests/misc/fallback.ts b/tests/e2e/tests/misc/fallback.ts
@@ -11,7 +11,7 @@ export default function () {
     .then(() => ngServe())
     .then(() => request('http://localhost:4200/'))
     .then(body => {
-      if (!body.match(/<app-root>Loading...<\/app-root>/)) {
+      if (!body.match(/<app-root><\/app-root>/)) {
         throw new Error('Response does not match expected value.');
       }
     })
@@ -25,7 +25,7 @@ export default function () {
     .then(() => ngServe())
     .then(() => request('http://localhost:4200/'))
     .then(body => {
-      if (!body.match(/<app-root>Loading...<\/app-root>/)) {
+      if (!body.match(/<app-root><\/app-root>/)) {
         throw new Error('Response does not match expected value.');
       }
     })

diff --git a/tests/e2e/tests/misc/live-reload.ts b/tests/e2e/tests/misc/live-reload.ts
@@ -36,6 +36,26 @@ export default function () {
 
   return Promise.resolve()
     .then(_ => writeMultipleFiles({
+      'src/app/app.module.ts': `
+        import { BrowserModule } from '@angular/platform-browser';
+        import { NgModule } from '@angular/core';
+        import { FormsModule } from '@angular/forms';
+        import { HttpModule } from '@angular/http';
+        import { AppComponent } from './app.component';
+        @NgModule({
+          declarations: [
+            AppComponent
+          ],
+          imports: [
+            BrowserModule,
+            FormsModule,
+            HttpModule
+          ],
+          providers: [],
+          bootstrap: [AppComponent]
+        })
+        export class AppModule { }
+      `,
       // e2e test that just opens the page and waits, so that the app runs.
       './e2e/app.e2e-spec.ts': `
         import { browser } from 'protractor';

diff --git a/tests/e2e/tests/misc/ssl-default-config.ts b/tests/e2e/tests/misc/ssl-default-config.ts
@@ -12,7 +12,7 @@ export default function() {
     .then(() => ngServe())
     .then(() => request('https://localhost:4200/'))
     .then(body => {
-      if (!body.match(/<app-root>Loading...<\/app-root>/)) {
+      if (!body.match(/<app-root><\/app-root>/)) {
         throw new Error('Response does not match expected value.');
       }
     })

diff --git a/tests/e2e/tests/misc/ssl-default.ts b/tests/e2e/tests/misc/ssl-default.ts
@@ -8,7 +8,7 @@ export default function() {
     .then(() => ngServe('--ssl', 'true'))
     .then(() => request('https://localhost:4200/'))
     .then(body => {
-      if (!body.match(/<app-root>Loading...<\/app-root>/)) {
+      if (!body.match(/<app-root><\/app-root>/)) {
         throw new Error('Response does not match expected value.');
       }
     })

diff --git a/tests/e2e/tests/misc/ssl-with-cert-config.ts b/tests/e2e/tests/misc/ssl-with-cert-config.ts
@@ -17,7 +17,7 @@ export default function() {
     .then(() => ngServe())
     .then(() => request('https://localhost:4200/'))
     .then(body => {
-      if (!body.match(/<app-root>Loading...<\/app-root>/)) {
+      if (!body.match(/<app-root><\/app-root>/)) {
         throw new Error('Response does not match expected value.');
       }
     })

diff --git a/tests/e2e/tests/misc/ssl-with-cert.ts b/tests/e2e/tests/misc/ssl-with-cert.ts
@@ -13,7 +13,7 @@ export default function() {
     ))
     .then(() => request('https://localhost:4200/'))
     .then(body => {
-      if (!body.match(/<app-root>Loading...<\/app-root>/)) {
+      if (!body.match(/<app-root><\/app-root>/)) {
         throw new Error('Response does not match expected value.');
       }
     })