Merge pull request #547 from firebase/jw-update-deps

Updated npm and bower dependencies

Author: katowulf

bower.json

@@ -34,8 +34,7 @@
     "firebase": "2.1.x"
   },
   "devDependencies": {
-    "lodash": "~2.4.1",
-    "angular-mocks": "~1.2.18",
-    "mockfirebase": "~0.7.0"
+    "angular-mocks": "~1.3.11",
+    "mockfirebase": "~0.8.0"
   }
 }

package.json

@@ -35,29 +35,30 @@
     "firebase": "2.1.x"
   },
   "devDependencies": {
-    "coveralls": "^2.11.1",
-    "grunt": "~0.4.1",
+    "coveralls": "^2.11.2",
+    "grunt": "~0.4.5",
     "grunt-cli": "^0.1.13",
-    "grunt-contrib-concat": "^0.4.0",
-    "grunt-contrib-connect": "^0.7.1",
-    "grunt-contrib-jshint": "~0.10.0",
-    "grunt-contrib-uglify": "~0.2.2",
-    "grunt-contrib-watch": "~0.5.1",
-    "grunt-karma": "~0.8.3",
-    "grunt-notify": "~0.2.7",
-    "grunt-protractor-runner": "^1.0.0",
-    "grunt-shell-spawn": "^0.3.0",
-    "jasmine-spec-reporter": "^0.4.0",
-    "karma": "~0.12.0",
-    "karma-chrome-launcher": "^0.1.4",
-    "karma-coverage": "^0.2.4",
-    "karma-failed-reporter": "0.0.2",
+    "grunt-contrib-concat": "^0.5.0",
+    "grunt-contrib-connect": "^0.9.0",
+    "grunt-contrib-jshint": "^0.11.0",
+    "grunt-contrib-uglify": "^0.7.0",
+    "grunt-contrib-watch": "^0.6.1",
+    "grunt-karma": "^0.10.1",
+    "grunt-notify": "^0.4.1",
+    "grunt-protractor-runner": "^1.2.1",
+    "grunt-shell-spawn": "^0.3.1",
+    "jasmine-core": "^2.1.3",
+    "jasmine-spec-reporter": "^2.1.0",
+    "karma": "~0.12.31",
+    "karma-chrome-launcher": "^0.1.7",
+    "karma-coverage": "^0.2.7",
+    "karma-failed-reporter": "0.0.3",
     "karma-html2js-preprocessor": "~0.1.0",
-    "karma-jasmine": "~0.2.0",
-    "karma-phantomjs-launcher": "~0.1.0",
-    "karma-sauce-launcher": "~0.2.9",
-    "karma-spec-reporter": "0.0.13",
-    "load-grunt-tasks": "~0.2.0",
-    "protractor": "^1.0.0"
+    "karma-jasmine": "^0.3.5",
+    "karma-phantomjs-launcher": "~0.1.4",
+    "karma-sauce-launcher": "~0.2.10",
+    "karma-spec-reporter": "0.0.16",
+    "load-grunt-tasks": "^3.1.0",
+    "protractor": "^1.6.1"
   }
 }

tests/protractor/chat/chat.spec.js

@@ -2,9 +2,6 @@ var protractor = require('protractor');
 var Firebase = require('firebase');
 
 describe('Chat App', function () {
-  // Protractor instance
-  var ptor = protractor.getInstance();
-
   // Reference to the Firebase which stores the data for this demo
   var firebaseRef = new Firebase('https://angularFireTests.firebaseio-demo.com/chat');
 
@@ -148,4 +145,4 @@ describe('Chat App', function () {
     expect(messages.count()).toBe(0);
     expect(messagesCount.getText()).toEqual('0');
   });
-});
+});

tests/unit/firebase.spec.js

@@ -136,11 +136,11 @@ describe('$firebase', function () {
     it('should reject if fails', function() {
       var whiteSpy = jasmine.createSpy('resolve');
       var blackSpy = jasmine.createSpy('reject');
-      $fb.$ref().failNext('push', 'failpush');
+      $fb.$ref().failNext('push', new Error('failpush'));
       $fb.$push({foo: 'bar'}).then(whiteSpy, blackSpy);
       flushAll();
       expect(whiteSpy).not.toHaveBeenCalled();
-      expect(blackSpy).toHaveBeenCalledWith('failpush');
+      expect(blackSpy).toHaveBeenCalledWith(new Error('failpush'));
     });
 
     it('should save correct data into Firebase', function() {
@@ -206,13 +206,13 @@ describe('$firebase', function () {
     });
 
     it('should reject if fails', function() {
-      $fb.$ref().failNext('set', 'setfail');
+      $fb.$ref().failNext('set', new Error('setfail'));
       var whiteSpy = jasmine.createSpy('resolve');
       var blackSpy = jasmine.createSpy('reject');
       $fb.$set({foo: 'bar'}).then(whiteSpy, blackSpy);
       flushAll();
       expect(whiteSpy).not.toHaveBeenCalled();
-      expect(blackSpy).toHaveBeenCalledWith('setfail');
+      expect(blackSpy).toHaveBeenCalledWith(new Error('setfail'));
     });
 
     it('should affect query keys only if query used', function() {
@@ -285,11 +285,11 @@ describe('$firebase', function () {
     it('should reject if fails', function() {
       var whiteSpy = jasmine.createSpy('resolve');
       var blackSpy = jasmine.createSpy('reject');
-      $fb.$ref().failNext('remove', 'test_fail_remove');
+      $fb.$ref().failNext('remove', new Error('test_fail_remove'));
       $fb.$remove().then(whiteSpy, blackSpy);
       flushAll();
       expect(whiteSpy).not.toHaveBeenCalled();
-      expect(blackSpy).toHaveBeenCalledWith('test_fail_remove');
+      expect(blackSpy).toHaveBeenCalledWith(new Error('test_fail_remove'));
     });
 
     it('should remove data in Firebase', function() {
@@ -371,11 +371,11 @@ describe('$firebase', function () {
     it('should reject if failed', function() {
       var whiteSpy = jasmine.createSpy('resolve');
       var blackSpy = jasmine.createSpy('reject');
-      $fb.$ref().failNext('update', 'oops');
+      $fb.$ref().failNext('update', new Error('oops'));
       $fb.$update({index: {foo: 'bar'}}).then(whiteSpy, blackSpy);
       flushAll();
       expect(whiteSpy).not.toHaveBeenCalled();
-      expect(blackSpy).toHaveBeenCalled();
+      expect(blackSpy).toHaveBeenCalledWith(new Error('oops'));
     });
 
     it('should not destroy untouched keys', function() {
@@ -435,11 +435,11 @@ describe('$firebase', function () {
     it('should reject if failed', function() {
       var whiteSpy = jasmine.createSpy('success');
       var blackSpy = jasmine.createSpy('failed');
-      $fb.$ref().child('a').failNext('transaction', 'test_fail');
+      $fb.$ref().child('a').failNext('transaction', new Error('test_fail'));
       $fb.$transaction('a', function() { return true; }).then(whiteSpy, blackSpy);
       flushAll();
       expect(whiteSpy).not.toHaveBeenCalled();
-      expect(blackSpy).toHaveBeenCalledWith('test_fail');
+      expect(blackSpy).toHaveBeenCalledWith(new Error('test_fail'));
     });
 
     it('should modify data in firebase', function() {