Skip to content

Fix duplicate events setup #116

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.

Sign up for GitHub

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

Closed
marshallswain wants to merge 2 commits into from
Closed

Fix duplicate events setup #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c270aa5
Fix duplicate events in dynamic services (through setup)
marshallswain Feb 17, 2015
af46b13
Fix event filtering callbacks in tests.
marshallswain Feb 17, 2015
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/application.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ module.exports = {

// If already _setup, just add this single service.
if (this._setup) {
protoService.setup(this, location);
// If we're using a socket provider, register the service on it.
if (this.addService) {
this.addService(protoService, location);
}
protoService.setup(this, location);
}

this.services[location] = protoService;
Expand Down
1 change: 0 additions & 1 deletion lib/providers/socket/commons.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ exports.addService = function addService(service, path){
}, this);

// Setup events for the service.
eventsMixin.applyEvents.call(service);
exports.setupEventHandlers.call(this, service, path);
};

Expand Down
11 changes: 3 additions & 8 deletions test/providers/primus.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ describe('Primus provider', function () {
return callback(null, data);
}

callback();
callback(null, false);
};

socket.send('todo::remove', 1, {}, function() {});
Expand Down Expand Up @@ -432,21 +432,16 @@ describe('Primus provider', function () {
return callback(null, data);
}

callback();
callback(null, false);
};

socket.send('tasks::remove', 1, {}, function() {});
socket.send('tasks::remove', 23, {}, function() {});

var ready = false;

socket.on('tasks removed', function (data) {
service.removed = oldRemoved;
assert.equal(data.id, 23);
if (ready) {
done();
}
ready = true;
done();
});
});
});
Expand Down
11 changes: 3 additions & 8 deletions test/providers/socketio.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ describe('SocketIO provider', function () {
return callback(null, data);
}

callback();
callback(null, false);
};

socket.emit('todo::remove', 1, {}, function() {});
Expand Down Expand Up @@ -431,21 +431,16 @@ describe('SocketIO provider', function () {
return callback(null, data);
}

callback();
callback(null, false);
};

socket.emit('tasks::remove', 1, {}, function() {});
socket.emit('tasks::remove', 23, {}, function() {});

var ready = false;

socket.on('tasks removed', function (data) {
service.removed = oldRemoved;
assert.equal(data.id, 23);
if (ready) {
done();
}
ready = true;
done();
});
});
});
Expand Down