Adds singleton test and fixes singleton bug

dresende · dresende · commit e366af9647a0 · 2012-11-26T19:15:56.000Z
diff --git a/lib/Singleton.js b/lib/Singleton.js
@@ -2,7 +2,7 @@ var map = {};
 
 exports.get = function (key, createCb, returnCb) {
 	if (map.hasOwnProperty(key)) {
-		return map[key];
+		return returnCb(map[key]);
 	}
 
 	createCb(function (value) {
diff --git a/test/integration/test-get-singleton.js b/test/integration/test-get-singleton.js
@@ -0,0 +1,26 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	db.driver.db.query([
+		"CREATE TEMPORARY TABLE `test_get_singleton` (",
+		"`id` INT (5) NOT NULL PRIMARY KEY AUTO_INCREMENT,",
+		"`name` VARCHAR(100) NOT NULL",
+		")"
+	].join(""), function () {
+		db.driver.db.query("INSERT INTO `test_get_singleton` VALUES (1, 'test')", function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_get_singleton');
+
+			TestModel.get(1, function (err, Instance1) {
+				assert.equal(err, null);
+				TestModel.get(1, function (err, Instance2) {
+					assert.equal(err, null);
+					assert.strictEqual(Instance1, Instance2);
+					db.close();
+				});
+			});
+		});
+	});
+});

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ var map = {};`
`2`	`2`
`3`	`3`	`exports.get = function (key, createCb, returnCb) {`
`4`	`4`	`if (map.hasOwnProperty(key)) {`
`5`		`- return map[key];`
	`5`	`+ return returnCb(map[key]);`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`createCb(function (value) {`