Use reject instead of nack, add tests

squaremo · squaremo · commit ad122aba22d4 · 2014-08-18T22:50:37.000+01:00
Pretty basic tests if I'm honest.

(`reject` is more backwards compatible than `nack`, and for single
messages, otherwise equivalent)
diff --git a/lib/sockets.js b/lib/sockets.js
@@ -353,7 +353,7 @@ WorkerSocket.prototype.requeue = function() {
     if (!msg) {
         throw new Error("requeue called with no unacknowledged messages");
     }
-    this.ch.nack(msg);
+    this.ch.reject(msg);
 };
 
 
@@ -500,7 +500,7 @@ RepSocket.prototype.requeue = function() {
     if (!current)
         throw new Error('Requeue with no pending request');
 
-    ch.nack(current);
+    ch.reject(current);
 };
 
 
diff --git a/test/tests.js b/test/tests.js
@@ -408,3 +408,45 @@ suite.queueError = testWithContext(function(done, CTX) {
   });
   sock.connect('amq.reserved-namespace');
 });
+
+suite.discardMessage = testWithContext(function(done, CTX) {
+  var worker = CTX.socket('WORKER');
+  var push = CTX.socket('PUSH');
+  worker.connect('test.worker-reject');
+  worker.on('data', function(m) {
+    worker.discard();
+    done();
+  });
+  push.connect('test.worker-reject', function(_ok) {
+    push.write('foobar');
+  });
+});
+
+suite.requeueMessage = testWithContext(function(done, CTX) {
+  var worker1 = CTX.socket('WORKER');
+  var worker2 = CTX.socket('WORKER');
+  var recvd = false;
+  var q = 'test.worker-requeue';
+
+  var push = CTX.socket('PUSH');
+  worker1.connect(q);
+  worker2.connect(q);
+
+  function recv(msg) {
+    if (recvd) {
+      this.ack();
+      done();
+    }
+    else {
+      this.requeue();
+      recvd = true;
+    }
+  }
+
+  worker1.on('data', recv.bind(worker1));
+  worker2.on('data', recv.bind(worker2));
+
+  push.connect(q, function(_ok) {
+    push.write('foobar');
+  });
+});
