Merge pull request FirebaseExtended#288 from twilson63/master

Fix for issue FirebaseExtended#286 (make sure child is object before adding $priority)

Author: katowulf

angularfire.js

@@ -59,7 +59,9 @@
             for (var i = 0; i < index.length; i++) {
               var val = input[index[i]];
               if (val) {
-                val.$id = index[i];
+                if (angular.isObject(val)) {
+                  val.$id = index[i];
+                }
                 sorted.push(val);
               }
             }

package.json

@@ -30,6 +30,7 @@
     "karma": "~0.10.4",
     "karma-chrome-launcher": "~0.1.0",
     "protractor": "~0.12.1",
-    "lodash": "~2.4.1"
+    "lodash": "~2.4.1",
+    "karma-safari-launcher": "~0.1.1"
   }
 }

tests/automatic_karma.conf.js

@@ -16,6 +16,6 @@ module.exports = function(config) {
 
     autoWatch: true,
     //Recommend starting Chrome manually with experimental javascript flag enabled, and open localhost:9876.
-    browsers: ['Chrome']
+    browsers: ['Chrome', 'Safari']
   });
 };

tests/unit/orderbypriority.spec.js

@@ -40,4 +40,24 @@ describe('OrderByPriority Filter', function () {
       });
       expect(res).toEqual(originalData);
    });
+
+   it('should return an array from a $firebase instance array', function () {
+      var loaded = false;
+      // autoFlush makes all Firebase methods trigger immediately
+      var fb = new Firebase('Mock//sort', 
+        {data: {'0': 'foo', '1': 'bar'}}
+      ).child('data').autoFlush();
+      var ref = $firebase(fb);
+      // $timeout is a mock, so we have to tell the mock when to trigger it
+      // and fire all the angularFire events
+      $timeout.flush();
+      // now we can actually trigger our filter and pass in the $firebase ref
+      var res = $filter('orderByPriority')(ref);
+      // and finally test the results against the original data in Firebase instance
+      var originalData = _.map(fb.getData(), function(v, k) {
+         return _.isObject(v)? _.assign({'$id': k}, v) : v;
+      });
+      expect(res).toEqual(originalData);
+   });
+
 });