Merge pull request #1444 from shackbarth/tests

get tests to pass

diff --git a/lib/backbone-x/source/collection.js b/lib/backbone-x/source/collection.js
index dfc3412..53b9441 100644 (file)
--- a/lib/backbone-x/source/collection.js
+++ b/lib/backbone-x/source/collection.js
@@ -351,6 +351,7 @@ white:true*/
       this.status = status;
 
       this.trigger('statusChange', this, status, options);
+      this.trigger('status:' + XM.Model._status[status], this, status, options);
       return this;
     },
 

diff --git a/test/specs/activity.js b/test/specs/activity.js
index ff8966a..d336cf5 100644 (file)
--- a/test/specs/activity.js
+++ b/test/specs/activity.js
@@ -51,7 +51,7 @@ before:true, exports:true, it:true, describe:true, XG:true */
         assignedTo = model.get("assignedTo") ? model.getValue("assignedTo.username") : null,
         newAssignedTo = assignedTo === "postgres" ? "admin" : "postgres",
         popup;
-      
+
       // Select the first model from the list, call the reassignUser function
       actList.select(0);
       actList.reassignUser();
@@ -61,7 +61,7 @@ before:true, exports:true, it:true, describe:true, XG:true */
       popup.$.customComponent.setValue(newAssignedTo);
       assert.equal(popup.$.customComponent.$.pickerButton.content, newAssignedTo);
       moduleContainer.notifyTap(null, { originator: {name: "notifyYes"}});
-      
+
       setTimeout(function () {
         assert.equal(actList.value.models[0].getValue("assignedTo.username"), newAssignedTo);
         done();