update(): fix old tests for working e2e env

devversion · devversion · commit 0f6ad5a2f50a · 2016-06-04T17:51:12.000+02:00
diff --git a/e2e/index.e2e.ts b/e2e/index.e2e.ts
@@ -1,7 +1,7 @@
 describe('index', () => {
 
   beforeEach(() => {
-    browser.get('/index.html');
+    browser.get('/');
   });
 
   it('should have a title', () => {
diff --git a/src/demo-app/index.html b/src/demo-app/index.html
@@ -1,6 +1,6 @@
 <!doctype html>
 {{!-- This file is an handlebar file that gets filled at build time. --}}
-<html>
+<html lang="en">
 <head>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
diff --git a/src/e2e-app/index.html b/src/e2e-app/index.html
@@ -1,6 +1,6 @@
 <!doctype html>
 {{!-- This file is an handlebar file that gets filled at build time. --}}
-<html>
+<html lang="en">
 <head>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
diff --git a/test/protractor.conf.js b/test/protractor.conf.js
@@ -17,12 +17,13 @@ const config = {
     package: 'protractor-accessibility-plugin'
   }],
   specs: [ path.join(__dirname, '../e2e/**/*.e2e.ts') ],
-  baseUrl: E2E_BASE_URL
+  baseUrl: E2E_BASE_URL,
 };
 
 
 if (process.env['TRAVIS'] !== undefined) {
   const key = require('../scripts/sauce/sauce_config');
+
   config.sauceUser = process.env['SAUCE_USERNAME'];
   config.sauceKey = key;
   config.capabilities = {
@@ -31,6 +32,12 @@ if (process.env['TRAVIS'] !== undefined) {
     'build': process.env['TRAVIS_JOB_NUMBER'],
     'name': 'Material 2 E2E Tests'
   };
+
+  // Protractors default timeout to wait for the Angular initialization is 10 seconds.
+  // This timeout is sometimes too short for sauce-connect tunnel connections.
+  // For example, a second page request took about 12 seconds.
+  // The timeout is specified in milliseconds.
+  config.getPageTimeout = 1000 * 15
 }
 
 
