mock interface modified. now adding save, fetch and delete mocks

FreeAllMedia · Sep 21, 2015 · 9e356fb · 9e356fb
1 parent d56b426
commit 9e356fb
Show file tree

Hide file tree

Showing 6 changed files with 131 additions and 215 deletions.
diff --git a/es5/lib/model/index.js b/es5/lib/model/index.js
@@ -514,6 +514,12 @@ var Model = (function () {
 			var modelQuery = new _modelFinderJs2["default"](this.database);
 			return modelQuery.count(this);
 		}
+	}, {
+		key: "mock",
+		get: function get() {
+			var modelQuery = new _modelFinderJs2["default"](this.database);
+			return modelQuery.mock(this);
+		}
 	}]);
 
 	return Model;

diff --git a/es5/lib/modelFinder.js b/es5/lib/modelFinder.js
@@ -42,7 +42,7 @@ var ModelFinder = (function () {
 			var query = new ModelQuery(ModelConstructor, {
 				database: (0, _incognito2["default"])(this).database
 			});
-			query.find();
+			query.find;
 
 			return query;
 		}
@@ -52,7 +52,18 @@ var ModelFinder = (function () {
 			var query = new ModelQuery(ModelConstructor, {
 				database: (0, _incognito2["default"])(this).database
 			});
-			query.count();
+			query.count;
+
+			return query;
+		}
+	}, {
+		key: "mock",
+		value: function mock(ModelConstructor) {
+			var query = new ModelQuery(ModelConstructor, {
+				database: (0, _incognito2["default"])(this).database
+			});
+
+			query.mock;
 
 			return query;
 		}
@@ -104,18 +115,6 @@ var ModelQuery = (function () {
 
 			return chainString;
 		}
-	}, {
-		key: "mockResults",
-		value: function mockResults(mockValue) {
-			var _ = (0, _incognito2["default"])(this);
-
-			_.ModelConstructor.mocks[this.toString()] = {
-				query: this,
-				value: mockValue
-			};
-
-			return this;
-		}
 	}, {
 		key: "equalTo",
 		value: function equalTo(query) {
@@ -151,38 +150,6 @@ var ModelQuery = (function () {
 
 			return isEqual;
 		}
-	}, {
-		key: "find",
-		value: function find() {
-			var _ = (0, _incognito2["default"])(this);
-
-			var tempModel = new _.ModelConstructor();
-
-			if (_.database) {
-				_.query = _.database.select("*").from(tempModel.tableName);
-			}
-
-			this[addChain](".find");
-
-			return this;
-		}
-	}, {
-		key: "count",
-		value: function count() {
-			var _ = (0, _incognito2["default"])(this);
-
-			this.countResults = true;
-
-			var tempModel = new _.ModelConstructor();
-
-			if (_.database) {
-				_.query = _.database.select(null).count("* AS rowCount").from(tempModel.tableName);
-			}
-
-			this[addChain](".count");
-
-			return this;
-		}
 	}, {
 		key: "where",
 		value: function where() {
@@ -288,25 +255,36 @@ var ModelQuery = (function () {
 		}
 	}, {
 		key: "results",
-		value: function results(callback) {
+		value: function results(callbackOrMockValue) {
 			var _ = (0, _incognito2["default"])(this);
 
-			var useMock = false;
-			var mockValue = undefined;
+			if (_.isMockDefinition) {
+				var mockValue = callbackOrMockValue;
 
-			for (var chainString in _.ModelConstructor.mocks) {
-				var mock = _.ModelConstructor.mocks[chainString];
-				if (this.equalTo(mock.query)) {
-					useMock = true;
-					mockValue = mock.value;
-					break;
+				_.ModelConstructor.mocks[this.toString()] = {
+					query: this,
+					value: mockValue
+				};
+			} else {
+				var callback = callbackOrMockValue;
+
+				var useMock = false;
+				var mockValue = undefined;
+
+				for (var chainString in _.ModelConstructor.mocks) {
+					var mock = _.ModelConstructor.mocks[chainString];
+					if (this.equalTo(mock.query)) {
+						useMock = true;
+						mockValue = mock.value;
+						break;
+					}
 				}
-			}
 
-			if (useMock) {
-				callback(null, mockValue);
-			} else {
-				this[callDatabase](callback);
+				if (useMock) {
+					callback(null, mockValue);
+				} else {
+					this[callDatabase](callback);
+				}
 			}
 		}
 	}, {
@@ -420,6 +398,12 @@ var ModelQuery = (function () {
 				}
 			}
 		}
+	}, {
+		key: "mock",
+		get: function get() {
+			(0, _incognito2["default"])(this).isMockDefinition = true;
+			return this;
+		}
 	}, {
 		key: "chain",
 		get: function get() {
@@ -450,6 +434,38 @@ var ModelQuery = (function () {
 		get: function get() {
 			this[addChain](".all");
 
+			return this;
+		}
+	}, {
+		key: "find",
+		get: function get() {
+			var _ = (0, _incognito2["default"])(this);
+
+			var tempModel = new _.ModelConstructor();
+
+			if (_.database) {
+				_.query = _.database.select("*").from(tempModel.tableName);
+			}
+
+			this[addChain](".find");
+
+			return this;
+		}
+	}, {
+		key: "count",
+		get: function get() {
+			var _ = (0, _incognito2["default"])(this);
+
+			this.countResults = true;
+
+			var tempModel = new _.ModelConstructor();
+
+			if (_.database) {
+				_.query = _.database.select(null).count("* AS rowCount").from(tempModel.tableName);
+			}
+
+			this[addChain](".count");
+
 			return this;
 		}
 	}]);

diff --git a/es5/spec/model/mockResults.spec.js b/es5/spec/model/mockResults.spec.js
diff --git a/es6/lib/model/index.js b/es6/lib/model/index.js
@@ -115,6 +115,11 @@ export default class Model {
 		return modelQuery.count(this);
 	}
 
+	static get mock() {
+		let modelQuery = new ModelFinder(this.database);
+		return modelQuery.mock(this);
+	}
+
 	/**
 	 * INSTANCE INTERFACE
 	 */