Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not autoAck when no messages are pulled #456

Merged
merged 1 commit into from
Mar 22, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/pubsub/subscription.js
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ Subscription.prototype.pull = function(options, callback) {
var messages = response.receivedMessages || [];
messages = messages.map(Subscription.formatMessage_);

if (self.autoAck) {
if (self.autoAck && messages.length !== 0) {
var ackIds = messages.map(function(message) {
return message.ackId;
});
Expand Down
12 changes: 12 additions & 0 deletions test/pubsub/subscription.js
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,18 @@ describe('Subscription', function() {
subscription.pull({}, assert.ifError);
});

it('should not autoAck if no messages returned', function(done) {
subscription.makeReq_ = function(method, path, qs, body, callback) {
callback(null, { receivedMessages: [] });
};
subscription.ack = function() {
throw new Error('I should not run.');
};
subscription.pull(function() {
done();
});
});

it('should pass id to ack', function(done) {
subscription.ack = function(id) {
assert.equal(id, expectedMessage.ackId);
Expand Down