Updated pubsub tests to test models with custom primary key attributes

andresberrios · Feb 12, 2014 · 0cfea4a · 0cfea4a
1 parent ce891c5
commit 0cfea4a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/test/integration/fixtures/sampleApp/api/controllers/UserController.js b/test/integration/fixtures/sampleApp/api/controllers/UserController.js
@@ -6,14 +6,14 @@ module.exports = {
 	},
 
 	message: function(req, res) {
-		User.findOne(1, function(err, user) {
+		User.findOne({user_id:1}, function(err, user) {
 			User.message(user, {greeting: 'hello'}, req);
 			res.send(200);
 		});
 	},
 
 	subscribe: function(req, res) {
-		User.subscribe(req, {id:req.param('id')}, req.param('context'));
+		User.subscribe(req, {user_id:req.param('id')}, req.param('context'));
 		res.send(200);
 	}
 

diff --git a/test/integration/fixtures/sampleApp/api/models/Pet.js b/test/integration/fixtures/sampleApp/api/models/Pet.js
@@ -1,6 +1,11 @@
 module.exports = {
-
+	autoPK: false,	
 	attributes: {
+		pet_id: {
+			type: 'integer',
+			primaryKey: true,
+			autoIncrement: true
+		},
 		name: 'string',
 		owner: {
 			model: 'user',

diff --git a/test/integration/fixtures/sampleApp/api/models/User.js b/test/integration/fixtures/sampleApp/api/models/User.js
@@ -1,6 +1,11 @@
 module.exports = {
-
+	autoPK: false,
 	attributes: {
+		user_id: {
+			type: 'integer',
+			primaryKey: true,
+			autoIncrement: true
+		},		
 		name: 'string',
 		pets: {
 			collection: 'pet',

diff --git a/test/integration/pubsub.modelEvents.subscribers.js b/test/integration/pubsub.modelEvents.subscribers.js
@@ -145,7 +145,7 @@ describe('pubsub :: ', function() {
 
 			});
 
-			it ('adding a user to the pet via POST /user/1/pets should result a correct `pet` event being received by all subscribers', function(done) {
+			it ('adding a user to the pet via POST /user/1/pets should result in a correct `pet` event being received by all subscribers', function(done) {
 
 				socket1.on('pet', function(message) {
 					assert(message.id == 1