Updates some tests to avoid depending on "id" as primary key

Author: dresende

test/integration/hook.js

@@ -150,7 +150,7 @@ describe("Hook", function() {
 					items[0].name.should.equal("Jane Doe");
 
 					// ensure it was really saved
-					Person.get(items[0].id, function (err, Item) {
+					Person.get(items[0][Person.id], function (err, Item) {
 						should.equal(err, null);
 						Item.name.should.equal("Jane Doe");
 
@@ -232,7 +232,7 @@ describe("Hook", function() {
 				return done();
 			});
 		});
-        
+
 		it("should allow modification of instance", function (done) {
 		    Person.beforeSave(function () {
 		        this.name = "Hook Worked";
@@ -263,7 +263,7 @@ describe("Hook", function() {
 					items[0].name.should.equal("Jane Doe");
 
 					// ensure it was really saved
-					Person.get(items[0].id, function (err, Item) {
+					Person.get(items[0][Person.id], function (err, Item) {
 						should.equal(err, null);
 						Item.name.should.equal("Jane Doe");
 

test/integration/instance.js

@@ -21,13 +21,10 @@ describe("Model instance", function() {
 
 			return helper.dropSync(Person, function () {
 				Person.create([{
-					id	: 1,
 					name: "Jeremy Doe"
 				}, {
-					id	: 2,
 					name: "John Doe"
 				}, {
-					id	: 3,
 					name: "Jane Doe"
 				}], done);
 			});
@@ -52,7 +49,8 @@ describe("Model instance", function() {
 		it("should always return true for instances", function (done) {
 			should.equal((new Person).isInstance, true);
 			should.equal((Person(4)).isInstance, true);
-			Person.get(2, function (err, item) {
+
+			Person.find().first(function (err, item) {
 				should.not.exist(err);
 				should.equal(item.isInstance, true);
 				return done();
@@ -67,7 +65,7 @@ describe("Model instance", function() {
 
 	describe("#isPersisted", function () {
 		it("should return true for persisted instances", function (done) {
-			Person.get(2, function (err, item) {
+			Person.find().first(function (err, item) {
 				should.not.exist(err);
 				should.equal(item.isPersisted(), true);
 				return done();
@@ -93,7 +91,7 @@ describe("Model instance", function() {
 		});
 
 		it("should return false for existing models", function (done) {
-			Person.get(2, function (err, item) {
+			Person.find().first(function (err, item) {
 				should.not.exist(err);
 				should.equal(item.isShell(), false);
 				return done();

test/integration/model-create.js

@@ -84,7 +84,7 @@ describe("Model.create()", function() {
 				should(Array.isArray(John.pets));
 
 				John.pets[0].should.have.property("name", "Deco");
-				John.pets[0].should.have.property("id");
+				John.pets[0].should.have.property(Pet.id);
 				John.pets[0].saved().should.be.true;
 
 				return done();
@@ -103,7 +103,7 @@ describe("Model.create()", function() {
 				should(Array.isArray(John.pets));
 
 				John.pets[0].should.have.property("name", "Deco");
-				John.pets[0].should.have.property("id");
+				John.pets[0].should.have.property(Pet.id);
 				John.pets[0].saved().should.be.true;
 
 				return done();

test/integration/model-exists.js

@@ -3,8 +3,9 @@ var helper   = require('../support/spec_helper');
 var ORM      = require('../../');
 
 describe("Model.exists()", function() {
-	var db = null;
+	var db     = null;
 	var Person = null;
+	var good_id, bad_id;
 
 	var setup = function () {
 		return function (done) {
@@ -14,15 +15,24 @@ describe("Model.exists()", function() {
 
 			return helper.dropSync(Person, function () {
 				Person.create([{
-					id  : 1,
 					name: "Jeremy Doe"
 				}, {
-					id  : 2,
 					name: "John Doe"
 				}, {
-					id  : 3,
 					name: "Jane Doe"
-				}], done);
+				}], function (err, people) {
+					good_id = people[0][Person.id];
+
+					if (typeof good_id == "number") {
+						// numeric ID
+						bad_id = good_id * 100;
+					} else {
+						// string ID, keep same length..
+						bad_id = good_id.split('').reverse().join('');
+					}
+
+					return done();
+				});
 			});
 		};
 	};
@@ -53,7 +63,7 @@ describe("Model.exists()", function() {
 		before(setup());
 
 		it("should return true if found", function (done) {
-			Person.exists(2, function (err, exists) {
+			Person.exists(good_id, function (err, exists) {
 				should.equal(err, null);
 
 				exists.should.be.true;
@@ -63,7 +73,7 @@ describe("Model.exists()", function() {
 		});
 
 		it("should return false if not found", function (done) {
-			Person.exists(4, function (err, exists) {
+			Person.exists(bad_id, function (err, exists) {
 				should.equal(err, null);
 
 				exists.should.be.false;
@@ -77,7 +87,7 @@ describe("Model.exists()", function() {
 		before(setup());
 
 		it("should return true if found", function (done) {
-			Person.exists([ 2 ], function (err, exists) {
+			Person.exists([ good_id ], function (err, exists) {
 				should.equal(err, null);
 
 				exists.should.be.true;
@@ -87,7 +97,7 @@ describe("Model.exists()", function() {
 		});
 
 		it("should return false if not found", function (done) {
-			Person.exists([ 4 ], function (err, exists) {
+			Person.exists([ bad_id ], function (err, exists) {
 				should.equal(err, null);
 
 				exists.should.be.false;