Merge pull request #361 from firebase/release_0.8_prifix

Fixes bug in FirebaseArray's setting of $priority during remote updates

Author: Jacob Wenger

dist/angularfire.js

@@ -1,9 +1,17 @@
 /*!
+<<<<<<< HEAD
+ angularfire v0.8.0-pre2 2014-07-29
+* https://github.com/firebase/angularFire
+* Copyright (c) 2014 Firebase, Inc.
+* MIT LICENSE: http://firebase.mit-license.org/
+*/
+=======
  * angularfire 0.8.0 2014-07-28
  * https://github.com/firebase/angularFire
  * Copyright (c) 2014 Firebase, Inc.
  * MIT LICENSE: http://firebase.mit-license.org/
  */
+>>>>>>> release_0.8
 
 // AngularFire is an officially supported AngularJS binding for Firebase.
 // The bindings let you associate a Firebase URL with a model (or set of
@@ -338,6 +346,7 @@
         $$moved: function(snap, prevChild) {
           var rec = this.$getRecord(snap.name());
           if( angular.isObject(rec) ) {
+            rec.$priority = snap.getPriority();
             this._process('child_moved', rec, prevChild);
           }
         },

dist/angularfire.min.js

@@ -306,6 +306,7 @@
         $$moved: function(snap, prevChild) {
           var rec = this.$getRecord(snap.name());
           if( angular.isObject(rec) ) {
+            rec.$priority = snap.getPriority();
             this._process('child_moved', rec, prevChild);
           }
         },

src/FirebaseArray.js

@@ -2,35 +2,51 @@ var protractor = require('protractor');
 var Firebase = require('firebase');
 
 describe('Priority App', function () {
-  // Protractor instance
-  var ptor = protractor.getInstance();
+  // Reference to the message repeater
+  var messages = element.all(by.repeater('message in messages'));
 
   // Reference to the Firebase which stores the data for this demo
   var firebaseRef = new Firebase('https://angularFireTests.firebaseio-demo.com/priority');
 
   // Boolean used to clear the Firebase on the first test only
   var firebaseCleared = false;
 
-  // Reference to the messages repeater
-  var messages = element.all(by.repeater('message in messages'));
+  beforeEach(function () {
+    var flow = protractor.promise.controlFlow();
+
+    if( !firebaseCleared ) {
+      firebaseCleared = true;
+      flow.execute(purge);
+    }
 
-  beforeEach(function (done) {
     // Navigate to the priority app
     browser.get('priority/priority.html');
 
-    // Clear the Firebase before the first test and sleep until it's finished
-    if (!firebaseCleared) {
-      firebaseRef.remove(function() {
-        firebaseCleared = true;
-        done();
+    // Wait for all data to load into the client
+    flow.execute(waitForData);
+
+    function purge() {
+      var def = protractor.promise.defer();
+      firebaseRef.remove(function(err) {
+        if( err ) { def.reject(err); }
+        else { def.fulfill(true); }
       });
+      return def.promise;
     }
-    else {
-      ptor.sleep(500);
-      done();
+
+    function waitForData() {
+      var def = protractor.promise.defer();
+      firebaseRef.once('value', function() {
+        def.fulfill(true);
+      });
+      return def.promise;
     }
   });
 
+  afterEach(function() {
+    firebaseRef.off();
+  });
+
   it('loads', function () {
   });
 
@@ -64,33 +80,57 @@ describe('Priority App', function () {
     expect($('.message:nth-of-type(3) .content').getText()).toEqual('Pretty fantastic!');
   });
 
-  xit('responds to external priority updates', function (done) {
-    // Update the priority of the first message
-    firebaseRef.startAt().limit(1).once("child_added", function (dataSnapshot1) {
-      dataSnapshot1.ref().setPriority(4, function() {
-        // Update the priority of the third message
-        firebaseRef.startAt(2).limit(1).once("child_added", function (dataSnapshot2) {
-          dataSnapshot2.ref().setPriority(0, function() {
-            // Make sure the page has three messages
-            expect(messages.count()).toBe(3);
-
-            // Make sure the priority of each message is correct
-            expect($('.message:nth-of-type(1) .priority').getText()).toEqual('0');
-            expect($('.message:nth-of-type(2) .priority').getText()).toEqual('1');
-            expect($('.message:nth-of-type(3) .priority').getText()).toEqual('4');
-
-            // Make sure the content of each message is correct
-            expect($('.message:nth-of-type(1) .content').getText()).toEqual('Pretty fantastic!');
-            expect($('.message:nth-of-type(2) .content').getText()).toEqual('Oh, hi. How are you?');
-            expect($('.message:nth-of-type(3) .content').getText()).toEqual('Hey there!');
-
-            // We need to sleep long enough for the promises above to resolve
-            ptor.sleep(500).then(function() {
-              done();
-            });
-          });
-        });
-      });
-    });
+  it('responds to external priority updates', function () {
+    var movesDone = waitForMoveEvents();
+    var flow = protractor.promise.controlFlow();
+    flow.execute(moveRecords);
+
+    expect(movesDone).toBe(true);
+    expect(messages.count()).toBe(3);
+    expect($('.message:nth-of-type(1) .priority').getText()).toEqual('0');
+    expect($('.message:nth-of-type(2) .priority').getText()).toEqual('1');
+    expect($('.message:nth-of-type(3) .priority').getText()).toEqual('4');
+
+    // Make sure the content of each message is correct
+    expect($('.message:nth-of-type(1) .content').getText()).toEqual('Pretty fantastic!');
+    expect($('.message:nth-of-type(2) .content').getText()).toEqual('Oh, hi. How are you?');
+    expect($('.message:nth-of-type(3) .content').getText()).toEqual('Hey there!');
+
+    function moveRecords() {
+      return setPriority(null, 4)
+        .then(setPriority.bind(null, 2, 0));
+    }
+
+    function waitForMoveEvents() {
+      var def = protractor.promise.defer();
+      var count = 0;
+      firebaseRef.on('child_moved', updateCount, def.reject);
+
+      function updateCount() {
+        if( ++count === 2 ) {
+          setTimeout(function() {
+            def.fulfill(true);
+          }, 10);
+          firebaseRef.off('child_moved', updateCount);
+        }
+      }
+      return def.promise;
+    }
+
+    function setPriority(start, pri) {
+      var def = protractor.promise.defer();
+      firebaseRef.startAt(start).limit(1).once('child_added', function(snap) {
+        var data = snap.val();
+        //todo https://github.com/firebase/angularFire/issues/333
+        //todo makeItChange just forces Angular to update the dom since it won't change
+        //todo when a $ variable updates
+        data.makeItChange = true;
+        snap.ref().setWithPriority(data, pri, function(err) {
+          if( err ) { def.reject(err); }
+          else { def.fulfill(snap.name()); }
+        })
+      }, def.reject);
+      return def.promise;
+    }
   });
 });