Merge e73f9ae into 0274132

FirebaseExtended · Sep 3, 2014 · 38a4ea3 · 38a4ea3
2 parents 0274132 + e73f9ae
commit 38a4ea3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/bower.json b/bower.json
@@ -32,11 +32,11 @@
   "dependencies": {
     "angular": "1.2.x || 1.3.x",
     "firebase": "1.0.x",
-    "firebase-simple-login": "1.6.x",
-    "mockfirebase": "~0.2.9"
+    "firebase-simple-login": "1.6.x"
   },
   "devDependencies": {
     "lodash": "~2.4.1",
-    "angular-mocks": "~1.2.18"
+    "angular-mocks": "~1.2.18",
+    "mockfirebase": "0.3"
   }
 }
diff --git a/tests/automatic_karma.conf.js b/tests/automatic_karma.conf.js
@@ -29,7 +29,7 @@ module.exports = function(config) {
     files: [
       '../bower_components/angular/angular.js',
       '../bower_components/angular-mocks/angular-mocks.js',
-      '../bower_components/mockfirebase/dist/mockfirebase.js',
+      '../bower_components/mockfirebase/browser/mockfirebase.js',
       'lib/**/*.js',
       '../src/module.js',
       '../src/**/*.js',

diff --git a/tests/sauce_karma.conf.js b/tests/sauce_karma.conf.js
@@ -20,7 +20,7 @@ module.exports = function(config) {
     files: [
       '../bower_components/angular/angular.js',
       '../bower_components/angular-mocks/angular-mocks.js',
-      '../bower_components/mockfirebase/dist/mockfirebase.js',
+      '../bower_components/mockfirebase/browser/mockfirebase.js',
       'lib/**/*.js',
       '../dist/angularfire.js',
       'mocks/**/*.js',