Chrome on Travis test.

Author: davideast

.travis.yml

@@ -5,6 +5,7 @@ sudo: false
 addons:
   sauce_connect: true
 before_install:
+- export CHROME_BIN=chromium-browser
 - export DISPLAY=:99.0
 - sh -e /etc/init.d/xvfb start
 install:

package.json

@@ -47,7 +47,7 @@
     "jasmine-core": "^2.2.0",
     "jasmine-spec-reporter": "^2.1.0",
     "karma": "~0.12.31",
-    "karma-chrome-launcher": "^0.1.7",
+    "karma-chrome-launcher": "^0.2.2",
     "karma-coverage": "^0.2.7",
     "karma-failed-reporter": "0.0.3",
     "karma-firefox-launcher": "^0.1.4",

tests/automatic_karma.conf.js

@@ -4,7 +4,7 @@
 module.exports = function(config) {
   config.set({
     frameworks: ['jasmine'],
-    browsers: ['PhantomJS'],
+    browsers: ['Chrome'],
     reporters: ['spec', 'failed', 'coverage'],
     autowatch: false,
     singleRun: true,
@@ -40,4 +40,19 @@ module.exports = function(config) {
       'unit/**/*.spec.js'
     ]
   });
+
+  var configuration = {
+      customLaunchers: {
+          Chrome_travis_ci: {
+              base: 'Chrome',
+              flags: ['--no-sandbox']
+          }
+      },
+  };
+
+  if (process.env.TRAVIS) {
+      configuration.browsers = ['Chrome_travis_ci'];
+  }
+
+  config.set(configuration);
 };

tests/protractor/tictactoe/tictactoe.spec.js

@@ -15,10 +15,13 @@ describe('TicTacToe App', function () {
   var flow = protractor.promise.controlFlow();
 
   function waitOne() {
-    return protractor.promise.delayed(500);
+    return protractor.promise.delayed(1500);
   }
 
   function sleep() {
+    // flow.execute takes a function and if the
+    // function returns a promise it waits for it
+    // to be resolved
     flow.execute(waitOne);
   }
 
@@ -65,22 +68,19 @@ describe('TicTacToe App', function () {
     $('#resetRef').click();
 
     // Wait for the board to reset
-    browser.sleep().then(function() {
-      // Make sure the board has 9 cells
+    sleep();
 
-      var cells = element.all(by.css('.cell'));
-      expect(cells.count()).toBe(9);
+    // Make sure the board has 9 cells
+    var cells = element.all(by.css('.cell'));
+    expect(cells.count()).toBe(9);
 
-      // Make sure the board is empty
-      cells.each(function(element) {
-        expect(element.getText()).toBe('');
-      });
+    // Make sure the board is empty
+    cells.each(function(element) {
+      expect(element.getText()).toBe('');
     });
   });
 
   it('updates the board when cells are clicked', function () {
-
-    var cells = element.all(by.css('.cell'));
     // Make sure the board has 9 cells
     expect(cells.count()).toBe(9);
 
@@ -89,20 +89,21 @@ describe('TicTacToe App', function () {
     cells.get(2).click();
     cells.get(6).click();
 
-    browser.sleep().then(function() {
-      // Make sure the content of each clicked cell is correct
-      expect(cells.get(0).getText()).toBe('X');
-      expect(cells.get(2).getText()).toBe('O');
-      expect(cells.get(6).getText()).toBe('X');
-    });
+    sleep();
 
+    // Make sure the content of each clicked cell is correct
+    expect(cells.get(0).getText()).toBe('X');
+    expect(cells.get(2).getText()).toBe('O');
+    expect(cells.get(6).getText()).toBe('X');
   });
 
   it('persists state across refresh', function(done) {
     // Refresh the page, passing the push ID to use for data storage
     browser.get('tictactoe/tictactoe.html?pushId=' + firebaseRef.key()).then(function() {
       // Wait for AngularFire to sync the initial state
       sleep();
+      sleep();
+
       // Make sure the board has 9 cells
       expect(cells.count()).toBe(9);