Merge pull request #695 from firebase/update-ng-version

Match Angular 1.3 and above

Author: katowulf

.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:

bower.json

@@ -25,7 +25,7 @@
     "!LICENSE"
   ],
   "dependencies": {
-    "angular": "1.3.x || 1.4.x",
+    "angular": "^1.3.0",
     "firebase": "2.x.x"
   }
 }

package.json

@@ -27,7 +27,7 @@
     "package.json"
   ],
   "dependencies": {
-    "angular": "1.3.x || 1.4.x",
+    "angular": "^1.3.0",
     "firebase": "2.x.x"
   },
   "devDependencies": {
@@ -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.html

@@ -4,7 +4,7 @@
     <title>AngularFire TicTacToe e2e Test</title>
 
     <!-- Angular -->
-    <script src="../../../node_modules/angular/angular.min.js"></script>
+    <script src="../../../node_modules/angular/angular.js"></script>
 
     <!-- Firebase -->
     <script src="../../../node_modules/firebase/lib/firebase-web.js"></script>

tests/protractor/tictactoe/tictactoe.js

@@ -1,5 +1,6 @@
 var app = angular.module('tictactoe', ['firebase']);
 app.controller('TicTacToeCtrl', function Chat($scope, $firebaseObject) {
+  $scope.board = {};
   // Get a reference to the Firebase
   var boardRef = new Firebase('https://angularfire.firebaseio-demo.com/tictactoe');
 

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);
   }