Merge branch 'release/0.3.1'

es5/lib/database.js

@@ -188,11 +188,6 @@ var Database = (function () {
 		get: function get() {
 			return new _mockQueryJs2["default"](this);
 		}
-	}, {
-		key: "spy",
-		get: function get() {
-			return new _mockQueryJs2["default"](this);
-		}
 	}]);
 
 	return Database;

es5/lib/query.js

@@ -351,11 +351,12 @@ var Query = (function () {
 		value: function value(mockQueries, callback) {
 			var mockFound = false;
 			var results = undefined;
+			var query = undefined;
 
 			for (var index in mockQueries) {
 				var mockQuery = mockQueries[index];
 
-				var query = mockQuery.query;
+				query = mockQuery.query;
 
 				results = mockQuery.results;
 
@@ -366,6 +367,7 @@ var Query = (function () {
 			}
 
 			if (mockFound) {
+				query.call;
 				callback(undefined, results);
 			} else {
 				throw new Error("No mock values available for: \"" + this.toString() + "\"", null);
@@ -381,6 +383,11 @@ var Query = (function () {
 		get: function get() {
 			return this.calls > 0;
 		}
+	}, {
+		key: "call",
+		get: function get() {
+			(0, _incognito2["default"])(this).calls += 1;
+		}
 	}, {
 		key: "delete",
 		get: function get() {

es5/spec/database/mock.results.spec.js

@@ -0,0 +1,36 @@
+"use strict";
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+var _libDatabaseJs = require("../../lib/database.js");
+
+var _libDatabaseJs2 = _interopRequireDefault(_libDatabaseJs);
+
+var databaseConfig = require("../../../database.json").testing;
+
+describe(".mock.results(mockResults)", function () {
+	var database = undefined;
+
+	beforeEach(function () {
+		database = new _libDatabaseJs2["default"](databaseConfig);
+	});
+
+	it("should return the mock query", function () {
+		var mockQuery = database.mock;
+		mockQuery.select("*").from("users").should.equal(mockQuery);
+	});
+
+	it("should increment the call count when subsequent matching queries are executed", function (done) {
+		var user = {
+			id: "cigyn1qip0000nxz84cv3bwu6",
+			name: "Bob"
+		};
+
+		var mockQuery = database.mock.select("*").from("users").results(user);
+
+		database.select("*").from("users").results(function () {
+			mockQuery.called.should.be["true"];
+			done();
+		});
+	});
+});

es5/spec/database/mock.spec.js

@@ -6,17 +6,20 @@ var _libDatabaseJs = require("../../lib/database.js");
 
 var _libDatabaseJs2 = _interopRequireDefault(_libDatabaseJs);
 
+var _libMockQueryJs = require("../../lib/mockQuery.js");
+
+var _libMockQueryJs2 = _interopRequireDefault(_libMockQueryJs);
+
 var databaseConfig = require("../../../database.json").testing;
 
 describe(".mock", function () {
-
   var database = undefined;
 
   beforeEach(function () {
     database = new _libDatabaseJs2["default"](databaseConfig);
   });
 
-  it("should return an instance of itself for chaining", function () {
-    database.mock.should.eql(database);
+  it("should return an instance of MockQuery", function () {
+    database.mock.should.be.instanceOf(_libMockQueryJs2["default"]);
   });
 });

es5/spec/database/query/results.spec.js

@@ -9,7 +9,6 @@ var _libDatabaseJs2 = _interopRequireDefault(_libDatabaseJs);
 var databaseConfig = require("../../../../database.json").testing;
 
 describe("query.results(callback)", function () {
-
 	var database = undefined;
 	var query = undefined;
 

es6/lib/database.js

@@ -128,10 +128,6 @@ export default class Database {
 		return new MockQuery(this);
 	}
 
-	get spy() {
-		return new MockQuery(this);
-	}
-
 	// unmock() {
 	// 	this.mockQueries = undefined;
 	// }

es6/lib/query.js

@@ -21,6 +21,10 @@ export default class Query {
 		return this.calls > 0;
 	}
 
+	get call() {
+		privateData(this).calls += 1;
+	}
+
 	select(...columns) {
 		privateData(this).query = privateData(this).knex.select(...columns);
 		this[addChain]("select", columns);
@@ -272,11 +276,12 @@ export default class Query {
 	[mockExecute](mockQueries, callback) {
 		let mockFound = false;
 		let results;
+		let query;
 
 		for (let index in mockQueries) {
 			const mockQuery = mockQueries[index];
 
-			const query = mockQuery.query;
+			query = mockQuery.query;
 
 			results = mockQuery.results;
 
@@ -287,6 +292,7 @@ export default class Query {
 		}
 
 		if (mockFound) {
+			query.call;
 			callback(undefined, results);
 		} else {
 			throw new Error(`No mock values available for: "${this.toString()}"`, null);

es6/spec/database/mock.results.spec.js

@@ -0,0 +1,36 @@
+import Database from "../../lib/database.js";
+
+const databaseConfig = require("../../../database.json").testing;
+
+describe(".mock.results(mockResults)", () => {
+  let database;
+
+  beforeEach(() => {
+		database = new Database(databaseConfig);
+	});
+
+  it("should return the mock query", () => {
+		const mockQuery = database.mock;
+		mockQuery.select("*").from("users").should.equal(mockQuery);
+  });
+
+	it("should increment the call count when subsequent matching queries are executed", done => {
+		const user = {
+			id: "cigyn1qip0000nxz84cv3bwu6",
+			name: "Bob"
+		};
+
+		const mockQuery = database.mock
+			.select("*")
+			.from("users")
+			.results(user);
+
+		database
+			.select("*")
+			.from("users")
+			.results(() => {
+				mockQuery.called.should.be.true;
+				done();
+			});
+	});
+});

es6/spec/database/mock.spec.js

@@ -1,16 +1,16 @@
 import Database from "../../lib/database.js";
+import MockQuery from "../../lib/mockQuery.js";
 
 const databaseConfig = require("../../../database.json").testing;
 
 describe(".mock", () => {
-
   let database;
 
   beforeEach(() => {
 		database = new Database(databaseConfig);
 	});
 
-  it("should return an instance of itself for chaining", () => {
-    database.mock.should.eql(database);
+  it("should return an instance of MockQuery", () => {
+		database.mock.should.be.instanceOf(MockQuery);
   });
 });

es6/spec/database/query/results.spec.js

@@ -3,7 +3,6 @@ import Database from "../../../lib/database.js";
 const databaseConfig = require("../../../../database.json").testing;
 
 describe("query.results(callback)", () => {
-
 	let database;
 	let query;
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "almaden",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "ES6 data adapter.",
   "main": "index.js",
   "scripts": {