Fixes a bug where stopReplying and stopComplying would unregister the…

… wrong events.
marionettejs · Oct 27, 2014 · 4442fbe · 4442fbe
1 parent 622ecbe
commit 4442fbe
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 3 deletions.
diff --git a/src/backbone.radio.js b/src/backbone.radio.js
@@ -77,9 +77,8 @@ function callHandler(callback, context, args) {
 function removeHandler(store, name, callback, context) {
   var event = store[name];
   if (
-    (!callback && !context) ||
-    callback && (callback === event.callback || callback === event.callback._callback) ||
-    context && context === event.context
+     (!callback || (callback === event.callback || callback === event.callback._callback)) &&
+     (!context || (context === event.context))
   ) {
     delete store[name];
     return true;

diff --git a/test/spec/commands.js b/test/spec/commands.js
@@ -315,6 +315,24 @@ describe('Commands:', function() {
       });
     });
 
+    describe('and passing a callback and a context', function() {
+      beforeEach(function() {
+        this.Commands.stopComplying(undefined, this.commandTwo, this.contextTwo);
+      });
+
+      it('should remove only matched handlers', function() {
+        expect(this.Commands._commands).to.not.contain.keys('commandFour');
+      });
+
+      it('should leave the other handlers', function() {
+        expect(this.Commands._commands).to.have.keys(['commandOne', 'commandTwo', 'commandThree', 'commandFive']);
+      });
+
+      it('should return the instance of Commands from stopComplying', function() {
+        expect(this.Commands.stopComplying).to.have.always.returned(this.Commands);
+      });
+    });
+
     describe('and passing a name, callback, and context', function() {
       beforeEach(function() {
         this.Commands.stopComplying('commandThree', this.commandTwo, this.contextOne);

diff --git a/test/spec/requests.js b/test/spec/requests.js
@@ -324,6 +324,24 @@ describe('Requests:', function() {
       });
     });
 
+    describe('and passing a callback and a context', function() {
+      beforeEach(function() {
+        this.Requests.stopReplying(undefined, this.requestTwo, this.contextTwo);
+      });
+
+      it('should remove only matched handlers', function() {
+        expect(this.Requests._requests).to.not.contain.keys('requestFour');
+      });
+
+      it('should leave the other handlers', function() {
+        expect(this.Requests._requests).to.have.keys(['requestOne', 'requestTwo', 'requestThree', 'requestFive']);
+      });
+
+      it('should return the instance of Requests from stopReplying', function() {
+        expect(this.Requests.stopReplying).to.have.always.returned(this.Requests);
+      });
+    });
+
     describe('and passing a name, callback, and context', function() {
       beforeEach(function() {
         this.Requests.stopReplying('requestThree', this.requestTwo, this.contextOne);