can-fixture - npm Package Compare versions

Comparing version 0.0.1 to 0.1.0

fixture.js

@@ -297,3 +297,3 @@ var canSet = require("can-set");
 					self.responseText = JSON.stringify(response[2][settings.dataType || 'json']);
-					self.onreadystatechange && self.onreadystatechange();
+					self.onreadystatechange && self.onreadystatechange({ target: self });
 					self.onload && self.onload();
@@ -306,3 +306,3 @@ } else {
 					self.responseText = typeof response[1] === "string" ? response[1] : JSON.stringify(response[1]);
-					self.onreadystatechange && self.onreadystatechange();
+					self.onreadystatechange && self.onreadystatechange({ target: self });
 					self.onload && self.onload();
@@ -319,3 +319,3 @@ }
 				self.responseText = typeof result === "string" ? result : JSON.stringify(result);
-				self.onreadystatechange && self.onreadystatechange();
+				self.onreadystatechange && self.onreadystatechange({ target: self });
 				self.onload && self.onload();
@@ -342,3 +342,3 @@ }
 
-		xhr.onreadystatechange = function(){
+		xhr.onreadystatechange = function(ev){
 			if(xhr.readyState === 4) {
@@ -350,4 +350,7 @@ // Copy back everything over because in IE8 defineProperty
 
-				self.onreadystatechange && self.onreadystatechange();
-				self.onload && self.onload();
+				self.onreadystatechange && self.onreadystatechange(ev);
+				if(self.onload && !xhr.__onloadCalled) {
+					self.onload();
+					xhr.__onloadCalled = true;
+				}
 			}
@@ -354,0 +357,0 @@ };

package.json

 {
   "name": "can-fixture",
-  "version": "0.0.1",
+  "version": "0.1.0",
   "description": "Intercept AJAX requests and simulate responses.",
@@ -5,0 +5,0 @@ "main": "fixture.js",

test/fixture_test.js

@@ -11,747 +11,703 @@ var Qunit = require('steal-qunit');
 
-	QUnit.module('can/util/fixture');
-	test('static fixtures', function () {
+QUnit.module('can-fixture');
+test('static fixtures', function () {
 
-		stop();
-		fixture('GET something', __dirname+'/fixtures/test.json');
-		fixture('POST something', __dirname+'/fixtures/test.json');
+	stop();
+	fixture('GET something', __dirname+'/fixtures/test.json');
+	fixture('POST something', __dirname+'/fixtures/test.json');
 
-		$.ajax({
-			url: 'something',
-			dataType: 'json'
-		})
-			.then(function (data) {
-				equal(data.sweet, 'ness', 'can.get works');
-				$.ajax({
-					url: 'something',
-					method: 'POST',
-					dataType: 'json'
-				})
-					.then(function (data) {
-						equal(data.sweet, 'ness', 'can.post works');
-						start();
-					},errorCallback);
-			}, errorCallback);
-	});
+	$.ajax({
+		url: 'something',
+		dataType: 'json'
+	})
+		.then(function (data) {
+			equal(data.sweet, 'ness', 'can.get works');
+			$.ajax({
+				url: 'something',
+				method: 'POST',
+				dataType: 'json'
+			})
+				.then(function (data) {
+					equal(data.sweet, 'ness', 'can.post works');
+					start();
+				},errorCallback);
+		}, errorCallback);
+});
 
-	test('templated static fixtures', function () {
-		stop();
-		fixture('GET some/{id}', __dirname+'/fixtures/stuff.{id}.json');
-		$.ajax({
-			url: 'some/3',
-			dataType: 'json'
-		})
-			.then(function (data) {
-				equal(data.id, 3, 'Got data with proper id');
-				start();
-			}, errorCallback);
+test('templated static fixtures', function () {
+	stop();
+	fixture('GET some/{id}', __dirname+'/fixtures/stuff.{id}.json');
+	$.ajax({
+		url: 'some/3',
+		dataType: 'json'
+	})
+		.then(function (data) {
+			equal(data.id, 3, 'Got data with proper id');
+			start();
+		}, errorCallback);
+});
+test('dynamic fixtures', function () {
+	stop();
+	fixture.delay = 10;
+	fixture('something', function () {
+		return [{
+			sweet: 'ness'
+		}];
 	});
-	test('dynamic fixtures', function () {
-		stop();
-		fixture.delay = 10;
-		fixture('something', function () {
-			return [{
-				sweet: 'ness'
-			}];
+	$.ajax({
+		url: 'something',
+		dataType: 'json'
+	})
+		.done(function (data) {
+			equal(data.sweet, 'ness', 'can.get works');
+			start();
 		});
-		$.ajax({
-			url: 'something',
-			dataType: 'json'
-		})
-			.done(function (data) {
-				equal(data.sweet, 'ness', 'can.get works');
-				start();
-			});
-	});
-	test('fixture function', 3, function () {
-		stop();
-		var url = __dirname+'/fixtures/foo.json';
-		fixture(url, __dirname+'/fixtures/foobar.json');
-		$.ajax({
-			url: url,
-			dataType: 'json'
-		})
-			.done(function (data) {
-				equal(data.sweet, 'ner', 'url passed works');
-				fixture(url, __dirname+'/fixtures/test.json');
-				$.ajax({
-					url: url,
-					dataType: 'json'
-				})
-					.done(function (data) {
-						equal(data.sweet, 'ness', 'replaced');
-						fixture(url, null);
-						$.ajax({
-							url: url,
-							dataType: 'json'
-						})
-							.done(function (data) {
-								equal(data.a, 'b', 'removed');
-								start();
-							});
-					});
-			});
-	});
+});
+test('fixture function', 3, function () {
+	stop();
+	var url = __dirname+'/fixtures/foo.json';
+	fixture(url, __dirname+'/fixtures/foobar.json');
+	$.ajax({
+		url: url,
+		dataType: 'json'
+	})
+		.done(function (data) {
+			equal(data.sweet, 'ner', 'url passed works');
+			fixture(url, __dirname+'/fixtures/test.json');
+			$.ajax({
+				url: url,
+				dataType: 'json'
+			})
+				.done(function (data) {
+					equal(data.sweet, 'ness', 'replaced');
+					fixture(url, null);
+					$.ajax({
+						url: url,
+						dataType: 'json'
+					})
+						.done(function (data) {
+							equal(data.a, 'b', 'removed');
+							start();
+						});
+				});
+		});
+});
 
 
-	test('fixture.store fixtures', function () {
-		stop();
-		var store = fixture.store('thing', 1000, function (i) {
-			return {
-				id: i,
-				name: 'thing ' + i
-			};
-		}, function (item, settings) {
-			if (settings.data.searchText) {
-				var regex = new RegExp('^' + settings.data.searchText);
-				return regex.test(item.name);
-			}
-		});
-		fixture('things', store.findAll);
+test('fixture.store fixtures', function () {
+	stop();
+	var store = fixture.store('thing', 1000, function (i) {
+		return {
+			id: i,
+			name: 'thing ' + i
+		};
+	}, function (item, settings) {
+		if (settings.data.searchText) {
+			var regex = new RegExp('^' + settings.data.searchText);
+			return regex.test(item.name);
+		}
+	});
+	fixture('things', store.findAll);
 
-		$.ajax({
-			url: 'things',
-			dataType: 'json',
-			data: {
-				offset: 100,
-				limit: 200,
-				order: ['name ASC'],
-				searchText: 'thing 2'
-			},
-			success: function (things) {
-				equal(things.data[0].name, 'thing 29', 'first item is correct');
-				equal(things.data.length, 11, 'there are 11 items');
-				start();
-			}
-		});
+	$.ajax({
+		url: 'things',
+		dataType: 'json',
+		data: {
+			offset: 100,
+			limit: 200,
+			order: ['name ASC'],
+			searchText: 'thing 2'
+		},
+		success: function (things) {
+			equal(things.data[0].name, 'thing 29', 'first item is correct');
+			equal(things.data.length, 11, 'there are 11 items');
+			start();
+		}
 	});
+});
 
-	test('simulating an error', function () {
-		var st = '{type: "unauthorized"}';
-		fixture('/foo', function (request, response) {
-			return response(401, st);
+test('simulating an error', function () {
+	var st = '{type: "unauthorized"}';
+	fixture('/foo', function (request, response) {
+		return response(401, st);
+	});
+	stop();
+	$.ajax({
+		url: '/foo',
+		dataType: 'json'
+	})
+		.done(function () {
+			ok(false, 'success called');
+			start();
+		})
+		.fail(function (original, type) {
+			ok(true, 'error called');
+			equal(original.responseText, st, 'Original text passed');
+			start();
 		});
-		stop();
-		$.ajax({
-			url: '/foo',
-			dataType: 'json'
-		})
-			.done(function () {
-				ok(false, 'success called');
-				start();
-			})
-			.fail(function (original, type) {
-				ok(true, 'error called');
-				equal(original.responseText, st, 'Original text passed');
-				start();
-			});
-	});
+});
 
-	test('rand', function () {
-		var rand = fixture.rand;
-		var num = rand(5);
-		equal(typeof num, 'number');
-		ok(num >= 0 && num < 5, 'gets a number');
-		stop();
-		var zero, three, between, next = function () {
-				start();
-			};
-		// make sure rand can be everything we need
-		setTimeout(function timer() {
-			var res = rand([1, 2, 3]);
+test('rand', function () {
+	var rand = fixture.rand;
+	var num = rand(5);
+	equal(typeof num, 'number');
+	ok(num >= 0 && num < 5, 'gets a number');
+	stop();
+	var zero, three, between, next = function () {
+			start();
+		};
+	// make sure rand can be everything we need
+	setTimeout(function timer() {
+		var res = rand([1, 2, 3]);
 
-			if (res.length === 0) {
-				zero = true;
-			} else if (res.length === 3) {
-				three = true;
-			} else {
-				between = true;
-			}
-			if (zero && three && between) {
-				ok(true, 'got zero, three, between');
-				next();
-			} else {
-				setTimeout(timer, 10);
-			}
-		}, 10);
-	});
+		if (res.length === 0) {
+			zero = true;
+		} else if (res.length === 3) {
+			three = true;
+		} else {
+			between = true;
+		}
+		if (zero && three && between) {
+			ok(true, 'got zero, three, between');
+			next();
+		} else {
+			setTimeout(timer, 10);
+		}
+	}, 10);
+});
 
-	test('_getData', function () {
-		var data = fixture._getData('/thingers/{id}', '/thingers/5');
-		equal(data.id, 5, 'gets data');
-		data = fixture._getData('/thingers/5?hi.there', '/thingers/5?hi.there');
-		deepEqual(data, {}, 'gets data');
-	});
+test('_getData', function () {
+	var data = fixture._getData('/thingers/{id}', '/thingers/5');
+	equal(data.id, 5, 'gets data');
+	data = fixture._getData('/thingers/5?hi.there', '/thingers/5?hi.there');
+	deepEqual(data, {}, 'gets data');
+});
 
-	test('_getData with double character value', function () {
-		var data = fixture._getData('/days/{id}/time_slots.json', '/days/17/time_slots.json');
-		equal(data.id, 17, 'gets data');
+test('_getData with double character value', function () {
+	var data = fixture._getData('/days/{id}/time_slots.json', '/days/17/time_slots.json');
+	equal(data.id, 17, 'gets data');
+});
+
+test('_compare', function () {
+	var same = set.equal({
+		url: '/thingers/5'
+	}, {
+		url: '/thingers/{id}'
+	}, fixture._compare);
+	ok(same, 'they are similar');
+	same = set.equal({
+		url: '/thingers/5'
+	}, {
+		url: '/thingers'
+	}, fixture._compare);
+	ok(!same, 'they are not the same');
+});
+
+test('_similar', function () {
+	var same = fixture._similar({
+		url: '/thingers/5'
+	}, {
+		url: '/thingers/{id}'
 	});
+	ok(same, 'similar');
+	same = fixture._similar({
+		url: '/thingers/5',
+		type: 'get'
+	}, {
+		url: '/thingers/{id}'
+	});
+	ok(same, 'similar with extra pops on settings');
+	var exact = fixture._similar({
+		url: '/thingers/5',
+		type: 'get'
+	}, {
+		url: '/thingers/{id}'
+	}, true);
+	ok(!exact, 'not exact');
+	exact = fixture._similar({
+		url: '/thingers/5'
+	}, {
+		url: '/thingers/5'
+	}, true);
+	ok(exact, 'exact');
+});
 
-	test('_compare', function () {
-		var same = set.equal({
-			url: '/thingers/5'
-		}, {
-			url: '/thingers/{id}'
-		}, fixture._compare);
-		ok(same, 'they are similar');
-		same = set.equal({
-			url: '/thingers/5'
-		}, {
-			url: '/thingers'
-		}, fixture._compare);
-		ok(!same, 'they are not the same');
+test('fixture function gets id', function () {
+	fixture('/thingers/{id}', function (settings) {
+		return {
+			id: settings.data.id,
+			name: 'justin'
+		};
 	});
+	stop();
+	$.ajax({
+		url: '/thingers/5',
+		dataType: 'json',
+		data: {
+			id: 5
+		}
+	})
+		.done(function (data) {
+			ok(data.id);
+			start();
+		});
+});
 
-	test('_similar', function () {
-		var same = fixture._similar({
-			url: '/thingers/5'
-		}, {
-			url: '/thingers/{id}'
-		});
-		ok(same, 'similar');
-		same = fixture._similar({
-			url: '/thingers/5',
-			type: 'get'
-		}, {
-			url: '/thingers/{id}'
-		});
-		ok(same, 'similar with extra pops on settings');
-		var exact = fixture._similar({
-			url: '/thingers/5',
-			type: 'get'
-		}, {
-			url: '/thingers/{id}'
-		}, true);
-		ok(!exact, 'not exact');
-		exact = fixture._similar({
-			url: '/thingers/5'
-		}, {
-			url: '/thingers/5'
-		}, true);
-		ok(exact, 'exact');
+test('replacing and removing a fixture', function () {
+	var url = __dirname+'/fixtures/remove.json';
+	fixture('GET ' + url, function () {
+		return {
+			weird: 'ness!'
+		};
 	});
-
-	test('fixture function gets id', function () {
-		fixture('/thingers/{id}', function (settings) {
-			return {
-				id: settings.data.id,
-				name: 'justin'
-			};
-		});
-		stop();
-		$.ajax({
-			url: '/thingers/5',
-			dataType: 'json',
-			data: {
-				id: 5
-			}
-		})
-			.done(function (data) {
-				ok(data.id);
-				start();
+	stop();
+	$.ajax({
+		url: url,
+		dataType: 'json'
+	})
+		.done(function (json) {
+			equal(json.weird, 'ness!', 'fixture set right');
+			fixture('GET ' + url, function () {
+				return {
+					weird: 'ness?'
+				};
 			});
-	});
-
-	test('replacing and removing a fixture', function () {
-		var url = __dirname+'/fixtures/remove.json';
-		fixture('GET ' + url, function () {
-			return {
-				weird: 'ness!'
-			};
+			$.ajax({
+				url: url,
+				dataType: 'json'
+			})
+				.done(function (json) {
+					equal(json.weird, 'ness?', 'fixture set right');
+					fixture('GET ' + url, null);
+					$.ajax({
+						url: url,
+						dataType: 'json'
+					})
+						.done(function (json) {
+							equal(json.weird, 'ness', 'fixture set right');
+							start();
+						});
+				});
 		});
-		stop();
-		$.ajax({
-			url: url,
-			dataType: 'json'
-		})
-			.done(function (json) {
-				equal(json.weird, 'ness!', 'fixture set right');
-				fixture('GET ' + url, function () {
-					return {
-						weird: 'ness?'
-					};
-				});
-				$.ajax({
-					url: url,
-					dataType: 'json'
-				})
-					.done(function (json) {
-						equal(json.weird, 'ness?', 'fixture set right');
-						fixture('GET ' + url, null);
-						$.ajax({
-							url: url,
-							dataType: 'json'
-						})
-							.done(function (json) {
-								equal(json.weird, 'ness', 'fixture set right');
-								start();
-							});
-					});
-			});
-	});
+});
 
-	test('fixture.store with can.Model', function () {
-		var store = fixture.store(100, function (i) {
-			return {
-				id: i,
-				name: 'Object ' + i
-			};
-		})/*,
-			Model = can.Model.extend({
-				findAll: 'GET /models',
-				findOne: 'GET /models/{id}',
-				create: 'POST /models',
-				update: 'PUT /models/{id}',
-				destroy: 'DELETE /models/{id}'
-			}, {})*/;
+test('fixture.store with can.Model', function () {
+	var store = fixture.store(100, function (i) {
+		return {
+			id: i,
+			name: 'Object ' + i
+		};
+	})/*,
+		Model = can.Model.extend({
+			findAll: 'GET /models',
+			findOne: 'GET /models/{id}',
+			create: 'POST /models',
+			update: 'PUT /models/{id}',
+			destroy: 'DELETE /models/{id}'
+		}, {})*/;
 
-		fixture('GET /models', store.getListData);
-		fixture('GET /models/{id}', store.getData);
-		fixture('POST /models', store.createData);
-		fixture('PUT /models/{id}', store.updateData);
-		fixture('DELETE /models/{id}', store.destroyData);
+	fixture('GET /models', store.getListData);
+	fixture('GET /models/{id}', store.getData);
+	fixture('POST /models', store.createData);
+	fixture('PUT /models/{id}', store.updateData);
+	fixture('DELETE /models/{id}', store.destroyData);
 
-		stop();
-		function errorAndStart(e){
-			ok(false, "borked"+e);
-			start();
-		}
+	stop();
+	function errorAndStart(e){
+		ok(false, "borked"+e);
+		start();
+	}
 
 
-		var check100Updated = function(){
-			return $.ajax({
-				url: "/models/100",
+	var check100Updated = function(){
+		return $.ajax({
+			url: "/models/100",
+			dataType: 'json'
+		}).then(function(model){
+			equal(model.name, 'Updated test object', 'Successfully updated object');
+		});
+	};
+
+
+	$.ajax({
+		url: "/models",
+		dataType: 'json'
+	}).then(function (modelsData) {
+		var models = modelsData.data;
+
+		equal(models.length, 100, 'Got 100 models for findAll with no parameters');
+		equal(models[95].name, 'Object 95', 'All models generated properly');
+		return $.ajax({
+				url: "/models/51",
 				dataType: 'json'
-			}).then(function(model){
-				equal(model.name, 'Updated test object', 'Successfully updated object');
-			});
-		};
+			})
+			.then(function (data) {
+				equal(data.id, 51, 'Got correct object id');
+				equal('Object 51', data.name, 'Object name generated correctly');
+				return $.ajax({
+						url: "/models",
+						dataType: 'json',
+						type: 'post',
+						data: {
+							name: 'My test object'
+						}
+					})
+					.then(function (newmodel) {
+						equal(newmodel.id, 100, 'Id got incremented');
+						// Tests creating, deleting, updating
+						return $.ajax({
+								url: "/models/100",
+								dataType: 'json'
+							})
+							.then(function (model) {
+								equal(model.id, 100, 'Loaded new object');
+								return $.ajax({
+										url: "/models/100",
+										dataType: 'json',
+										type: 'put',
+										data: {
+											name: 'Updated test object'
+										}
+									})
+									.then(function (model) {
 
+										return check100Updated().then(function(){
 
-		$.ajax({
-			url: "/models",
-			dataType: 'json'
-		}).then(function (modelsData) {
-			var models = modelsData.data;
+											return $.ajax({
+													url: "/models/100",
+													dataType: 'json',
+													type: 'delete'
+												})
+												.then(function (deleted) {
+													start();
+												},errorAndStart);
 
-			equal(models.length, 100, 'Got 100 models for findAll with no parameters');
-			equal(models[95].name, 'Object 95', 'All models generated properly');
-			return $.ajax({
-					url: "/models/51",
-					dataType: 'json'
-				})
-				.then(function (data) {
-					equal(data.id, 51, 'Got correct object id');
-					equal('Object 51', data.name, 'Object name generated correctly');
-					return $.ajax({
-							url: "/models",
-							dataType: 'json',
-							type: 'post',
-							data: {
-								name: 'My test object'
-							}
-						})
-						.then(function (newmodel) {
-							equal(newmodel.id, 100, 'Id got incremented');
-							// Tests creating, deleting, updating
-							return $.ajax({
-									url: "/models/100",
-									dataType: 'json'
-								})
-								.then(function (model) {
-									equal(model.id, 100, 'Loaded new object');
-									return $.ajax({
-											url: "/models/100",
-											dataType: 'json',
-											type: 'put',
-											data: {
-												name: 'Updated test object'
-											}
-										})
-										.then(function (model) {
+										}, errorAndStart);
 
-											return check100Updated().then(function(){
+									},errorAndStart);
+							},errorAndStart);
+					},errorAndStart);
+			},errorAndStart);
+	}, errorAndStart);
+});
 
-												return $.ajax({
-														url: "/models/100",
-														dataType: 'json',
-														type: 'delete'
-													})
-													.then(function (deleted) {
-														start();
-													},errorAndStart);
+test('fixture.store returns 404 on findOne with bad id (#803)', function () {
+	var store = fixture.store(2, function (i) {
+		return {
+			id: i,
+			name: 'Object ' + i
+		};
+	});
 
-											}, errorAndStart);
+	fixture('GET /models/{id}', store.findOne);
+	stop();
 
-										},errorAndStart);
-								},errorAndStart);
-						},errorAndStart);
-				},errorAndStart);
-		}, errorAndStart);
+	$.ajax({url: "/models/3", dataType: "json"}).then(function(){},function (data) {
+		equal(data.statusText, 'error', 'statusText');
+		equal(data.responseText, 'Requested resource not found', 'responseText');
+		start();
 	});
+});
 
-	test('fixture.store returns 404 on findOne with bad id (#803)', function () {
-		var store = fixture.store(2, function (i) {
-			return {
-				id: i,
-				name: 'Object ' + i
-			};
-		});
+test('fixture.store returns 404 on update with a bad id (#803)', function () {
+	var store = fixture.store(5, function (i) {
+		return {
+			id: i,
+			name: 'Object ' + i
+		};
+	});
 
-		fixture('GET /models/{id}', store.findOne);
-		stop();
+	stop();
 
-		$.ajax({url: "/models/3", dataType: "json"}).then(function(){},function (data) {
-			equal(data.statusText, 'error', 'statusText');
-			equal(data.responseText, 'Requested resource not found', 'responseText');
+	fixture('POST /models/{id}', store.update);
+
+	$.ajax({url: "/models/6", dataType: "json", data: {'jedan': 'dva'}, type: 'POST'})
+		.then(function(){},function (data) {
+			equal(data.statusText, 'error', 'Got an error');
+			equal(data.responseText, 'Requested resource not found', 'Got correct status message');
 			start();
 		});
+});
+
+test('fixture.store returns 404 on destroy with a bad id (#803)', function () {
+	var store = fixture.store(2, function (i) {
+		return {
+			id: i,
+			name: 'Object ' + i
+		};
 	});
 
-	test('fixture.store returns 404 on update with a bad id (#803)', function () {
-		var store = fixture.store(5, function (i) {
-			return {
-				id: i,
-				name: 'Object ' + i
-			};
-		});
+	stop();
 
-		stop();
+	fixture('DELETE /models/{id}', store.destroy);
 
-		fixture('POST /models/{id}', store.update);
+	$.ajax({url: "/models/6", dataType: "json", type: 'DELETE'})
+		.then(function(){},function (data) {
+			equal(data.statusText, 'error', 'Got an error');
+			equal(data.responseText, 'Requested resource not found', 'Got correct status message');
+			start();
+		});
+});
 
-		$.ajax({url: "/models/6", dataType: "json", data: {'jedan': 'dva'}, type: 'POST'})
-			.then(function(){},function (data) {
-				equal(data.statusText, 'error', 'Got an error');
-				equal(data.responseText, 'Requested resource not found', 'Got correct status message');
-				start();
-			});
-	});
-
-	test('fixture.store returns 404 on destroy with a bad id (#803)', function () {
-		var store = fixture.store(2, function (i) {
+test('fixture.store can use id of different type (#742)', function () {
+	var store = fixture.store(100, function (i) {
 			return {
 				id: i,
+				parentId: i * 2,
 				name: 'Object ' + i
 			};
 		});
+	fixture('GET /models', store.findAll);
+	stop();
+	$.ajax({url: "/models", dataType: "json", data: { parentId: '4' } })
+		.then(function (models) {
+			equal(models.data.length, 1, 'Got one model');
+			deepEqual(models.data[0], { id: 2, parentId: 4, name: 'Object 2' });
+			start();
+		});
+});
 
-		stop();
-
-		fixture('DELETE /models/{id}', store.destroy);
-
-		$.ajax({url: "/models/6", dataType: "json", type: 'DELETE'})
-			.then(function(){},function (data) {
-				equal(data.statusText, 'error', 'Got an error');
-				equal(data.responseText, 'Requested resource not found', 'Got correct status message');
-				start();
-			});
+test('fixture with response callback', 4, function () {
+	fixture.delay = 10;
+	fixture('responseCb', function (orig, response) {
+		response({
+			sweet: 'ness'
+		});
 	});
-
-	test('fixture.store can use id of different type (#742)', function () {
-		var store = fixture.store(100, function (i) {
-				return {
-					id: i,
-					parentId: i * 2,
-					name: 'Object ' + i
-				};
-			});
-		fixture('GET /models', store.findAll);
-		stop();
-		$.ajax({url: "/models", dataType: "json", data: { parentId: '4' } })
-			.then(function (models) {
-				equal(models.data.length, 1, 'Got one model');
-				deepEqual(models.data[0], { id: 2, parentId: 4, name: 'Object 2' });
-				start();
-			});
+	fixture('responseErrorCb', function (orig, response) {
+		response(404, 'This is an error from callback');
 	});
-
-	test('fixture with response callback', 4, function () {
-		fixture.delay = 10;
-		fixture('responseCb', function (orig, response) {
-			response({
-				sweet: 'ness'
-			});
+	stop();
+	$.ajax({
+		url: 'responseCb',
+		dataType: 'json'
+	})
+		.done(function (data) {
+			equal(data.sweet, 'ness', 'can.get works');
+			start();
 		});
-		fixture('responseErrorCb', function (orig, response) {
-			response(404, 'This is an error from callback');
+	stop();
+	$.ajax({
+		url: 'responseErrorCb',
+		dataType: 'json'
+	})
+		.fail(function (orig, error, text) {
+			equal(error, 'error', 'Got error status');
+			equal(orig.responseText, 'This is an error from callback', 'Got error text');
+			start();
 		});
-		stop();
-		$.ajax({
-			url: 'responseCb',
-			dataType: 'json'
-		})
-			.done(function (data) {
-				equal(data.sweet, 'ness', 'can.get works');
-				start();
-			});
-		stop();
-		$.ajax({
-			url: 'responseErrorCb',
-			dataType: 'json'
-		})
-			.fail(function (orig, error, text) {
-				equal(error, 'error', 'Got error status');
-				equal(orig.responseText, 'This is an error from callback', 'Got error text');
-				start();
-			});
-		stop();
-		fixture('cbWithTimeout', function (orig, response) {
-			setTimeout(function () {
-				response([{
-					epic: 'ness'
-				}]);
-			}, 10);
+	stop();
+	fixture('cbWithTimeout', function (orig, response) {
+		setTimeout(function () {
+			response([{
+				epic: 'ness'
+			}]);
+		}, 10);
+	});
+	$.ajax({
+		url: 'cbWithTimeout',
+		dataType: 'json'
+	})
+		.done(function (data) {
+			equal(data[0].epic, 'ness', 'Got responsen with timeout');
+			start();
 		});
-		$.ajax({
-			url: 'cbWithTimeout',
-			dataType: 'json'
-		})
-			.done(function (data) {
-				equal(data[0].epic, 'ness', 'Got responsen with timeout');
-				start();
-			});
-	});
+});
 
-	test('store create works with an empty array of items', function () {
-		var store = fixture.store(0, function () {
-			return {};
-		});
-		store.create({
-			data: {}
-		}, function (responseData, responseHeaders) {
-			equal(responseData.id, 0, 'the first id is 0');
-		});
+test('store create works with an empty array of items', function () {
+	var store = fixture.store(0, function () {
+		return {};
 	});
+	store.create({
+		data: {}
+	}, function (responseData, responseHeaders) {
+		equal(responseData.id, 0, 'the first id is 0');
+	});
+});
 
-	test('store creates sequential ids', function () {
-		var store = fixture.store(0, function () {
-			return {};
-		});
-		store.create({
-			data: {}
-		}, function (responseData, responseHeaders) {
-			equal(responseData.id, 0, 'the first id is 0');
-		});
-		store.create({
-			data: {}
-		}, function (responseData, responseHeaders) {
-			equal(responseData.id, 1, 'the second id is 1');
-		});
-		store.destroy({
-			data: {
-				id: 0
-			}
-		});
-		store.create({
-			data: {}
-		}, function (responseData, responseHeaders) {
-			equal(responseData.id, 2, 'the third id is 2');
-		});
+test('store creates sequential ids', function () {
+	var store = fixture.store(0, function () {
+		return {};
 	});
+	store.create({
+		data: {}
+	}, function (responseData, responseHeaders) {
+		equal(responseData.id, 0, 'the first id is 0');
+	});
+	store.create({
+		data: {}
+	}, function (responseData, responseHeaders) {
+		equal(responseData.id, 1, 'the second id is 1');
+	});
+	store.destroy({
+		data: {
+			id: 0
+		}
+	});
+	store.create({
+		data: {}
+	}, function (responseData, responseHeaders) {
+		equal(responseData.id, 2, 'the third id is 2');
+	});
+});
 
-	test('fixture updates request.data with id', function() {
-		expect(1);
-		stop();
+test('fixture updates request.data with id', function() {
+	expect(1);
+	stop();
 
 
-		fixture('foo/{id}', function(request) {
-			equal(request.data.id, 5);
-			start();
-		});
+	fixture('foo/{id}', function(request) {
+		equal(request.data.id, 5);
+		start();
+	});
 
-		$.ajax({
-			url: 'foo/5'
-		});
+	$.ajax({
+		url: 'foo/5'
 	});
+});
 
-	test("create a store with array and comparison object",function(){
+test("create a store with array and comparison object",function(){
 
-		var store = fixture.store([
-			{id: 1, modelId: 1, year: 2013, name: "2013 Mustang", thumb: "http://mustangsdaily.com/blog/wp-content/uploads/2012/07/01-2013-ford-mustang-gt-review-585x388.jpg"},
-			{id: 2, modelId: 1, year: 2014, name: "2014 Mustang", thumb: "http://mustangsdaily.com/blog/wp-content/uploads/2013/03/2014-roush-mustang.jpg"},
-			{id: 2, modelId: 2, year: 2013, name: "2013 Focus", thumb: "http://images.newcars.com/images/car-pictures/original/2013-Ford-Focus-Sedan-S-4dr-Sedan-Exterior.png"},
-			{id: 2, modelId: 2, year: 2014, name: "2014 Focus", thumb: "http://ipinvite.iperceptions.com/Invitations/survey705/images_V2/top4.jpg"},
-			{id: 2, modelId: 3, year: 2013, name: "2013 Altima", thumb: "http://www.blogcdn.com/www.autoblog.com/media/2012/04/04-2013-nissan-altima-1333416664.jpg"},
-			{id: 2, modelId: 3, year: 2014, name: "2014 Altima", thumb: "http://www.blogcdn.com/www.autoblog.com/media/2012/04/01-2013-nissan-altima-ny.jpg"},
-			{id: 2, modelId: 4, year: 2013, name: "2013 Leaf", thumb: "http://www.blogcdn.com/www.autoblog.com/media/2012/04/01-2013-nissan-altima-ny.jpg"},
-			{id: 2, modelId: 4, year: 2014, name: "2014 Leaf", thumb: "http://images.thecarconnection.com/med/2013-nissan-leaf_100414473_m.jpg"}
-		],{
-			year: function(a, b){
-				return a == b;
+	var store = fixture.store([
+		{id: 1, modelId: 1, year: 2013, name: "2013 Mustang", thumb: "http://mustangsdaily.com/blog/wp-content/uploads/2012/07/01-2013-ford-mustang-gt-review-585x388.jpg"},
+		{id: 2, modelId: 1, year: 2014, name: "2014 Mustang", thumb: "http://mustangsdaily.com/blog/wp-content/uploads/2013/03/2014-roush-mustang.jpg"},
+		{id: 2, modelId: 2, year: 2013, name: "2013 Focus", thumb: "http://images.newcars.com/images/car-pictures/original/2013-Ford-Focus-Sedan-S-4dr-Sedan-Exterior.png"},
+		{id: 2, modelId: 2, year: 2014, name: "2014 Focus", thumb: "http://ipinvite.iperceptions.com/Invitations/survey705/images_V2/top4.jpg"},
+		{id: 2, modelId: 3, year: 2013, name: "2013 Altima", thumb: "http://www.blogcdn.com/www.autoblog.com/media/2012/04/04-2013-nissan-altima-1333416664.jpg"},
+		{id: 2, modelId: 3, year: 2014, name: "2014 Altima", thumb: "http://www.blogcdn.com/www.autoblog.com/media/2012/04/01-2013-nissan-altima-ny.jpg"},
+		{id: 2, modelId: 4, year: 2013, name: "2013 Leaf", thumb: "http://www.blogcdn.com/www.autoblog.com/media/2012/04/01-2013-nissan-altima-ny.jpg"},
+		{id: 2, modelId: 4, year: 2014, name: "2014 Leaf", thumb: "http://images.thecarconnection.com/med/2013-nissan-leaf_100414473_m.jpg"}
+	],{
+		year: function(a, b){
+			return a == b;
 
-			},
-			modelId: function(a, b){
-				return a == b;
-			}
-		});
+		},
+		modelId: function(a, b){
+			return a == b;
+		}
+	});
 
 
-		fixture('GET /presetStore', store.findAll);
-		stop();
-		$.ajax({ url: "/presetStore", method: "get", data: {year: 2013, modelId:1}, dataType: "json" }).then(function(response){
+	fixture('GET /presetStore', store.findAll);
+	stop();
+	$.ajax({ url: "/presetStore", method: "get", data: {year: 2013, modelId:1}, dataType: "json" }).then(function(response){
 
-			equal(response.data[0].id, 1, "got the first item");
-			equal(response.data.length, 1, "only got one item");
-			start();
-		});
-
+		equal(response.data[0].id, 1, "got the first item");
+		equal(response.data.length, 1, "only got one item");
+		start();
 	});
 
-	test("store with objects allows .create, .update and .destroy (#1471)", 4, function(){
+});
 
-		var store = fixture.store([
-			{id: 1, modelId: 1, year: 2013, name: "2013 Mustang", thumb: "http://mustangsdaily.com/blog/wp-content/uploads/2012/07/01-2013-ford-mustang-gt-review-585x388.jpg"},
-			{id: 2, modelId: 1, year: 2014, name: "2014 Mustang", thumb: "http://mustangsdaily.com/blog/wp-content/uploads/2013/03/2014-roush-mustang.jpg"},
-			{id: 3, modelId: 2, year: 2013, name: "2013 Focus", thumb: "http://images.newcars.com/images/car-pictures/original/2013-Ford-Focus-Sedan-S-4dr-Sedan-Exterior.png"},
-			{id: 4, modelId: 2, year: 2014, name: "2014 Focus", thumb: "http://ipinvite.iperceptions.com/Invitations/survey705/images_V2/top4.jpg"},
-			{id: 5, modelId: 3, year: 2013, name: "2013 Altima", thumb: "http://www.blogcdn.com/www.autoblog.com/media/2012/04/04-2013-nissan-altima-1333416664.jpg"},
-			{id: 6, modelId: 3, year: 2014, name: "2014 Altima", thumb: "http://www.blogcdn.com/www.autoblog.com/media/2012/04/01-2013-nissan-altima-ny.jpg"},
-			{id: 7, modelId: 4, year: 2013, name: "2013 Leaf", thumb: "http://www.blogcdn.com/www.autoblog.com/media/201204/01-2013-nissan-altima-ny.jpg"},
-			{id: 8, modelId: 4, year: 2014, name: "2014 Leaf", thumb: "http://images.thecarconnection.com/med/2013-nissan-leaf_100414473_m.jpg"}
-		]);
+test("store with objects allows .create, .update and .destroy (#1471)", 4, function(){
 
+	var store = fixture.store([
+		{id: 1, modelId: 1, year: 2013, name: "2013 Mustang", thumb: "http://mustangsdaily.com/blog/wp-content/uploads/2012/07/01-2013-ford-mustang-gt-review-585x388.jpg"},
+		{id: 2, modelId: 1, year: 2014, name: "2014 Mustang", thumb: "http://mustangsdaily.com/blog/wp-content/uploads/2013/03/2014-roush-mustang.jpg"},
+		{id: 3, modelId: 2, year: 2013, name: "2013 Focus", thumb: "http://images.newcars.com/images/car-pictures/original/2013-Ford-Focus-Sedan-S-4dr-Sedan-Exterior.png"},
+		{id: 4, modelId: 2, year: 2014, name: "2014 Focus", thumb: "http://ipinvite.iperceptions.com/Invitations/survey705/images_V2/top4.jpg"},
+		{id: 5, modelId: 3, year: 2013, name: "2013 Altima", thumb: "http://www.blogcdn.com/www.autoblog.com/media/2012/04/04-2013-nissan-altima-1333416664.jpg"},
+		{id: 6, modelId: 3, year: 2014, name: "2014 Altima", thumb: "http://www.blogcdn.com/www.autoblog.com/media/2012/04/01-2013-nissan-altima-ny.jpg"},
+		{id: 7, modelId: 4, year: 2013, name: "2013 Leaf", thumb: "http://www.blogcdn.com/www.autoblog.com/media/201204/01-2013-nissan-altima-ny.jpg"},
+		{id: 8, modelId: 4, year: 2014, name: "2014 Leaf", thumb: "http://images.thecarconnection.com/med/2013-nissan-leaf_100414473_m.jpg"}
+	]);
 
-		fixture('GET /cars', store.findAll);
-		fixture('POST /cars', store.create);
-		fixture('PUT /cars/{id}', store.update);
-		fixture('DELETE /cars/{id}', store.destroy);
 
-		var findAll = function(){
-			return $.ajax({ url: "/cars", dataType: "json" });
-		};
+	fixture('GET /cars', store.findAll);
+	fixture('POST /cars', store.create);
+	fixture('PUT /cars/{id}', store.update);
+	fixture('DELETE /cars/{id}', store.destroy);
 
-		stop();
+	var findAll = function(){
+		return $.ajax({ url: "/cars", dataType: "json" });
+	};
 
-		// $.ajax({ url: "/presetStore", method: "get", data: {year: 2013, modelId:1}, dataType: "json" })
+	stop();
 
-		findAll().then(function(carsData) {
-			equal(carsData.data.length, 8, 'Got all cars');
-			return $.ajax({ url: "/cars/"+carsData.data[1].id, method: "DELETE", dataType: "json" });
-		}).then(function() {
-			return findAll();
-		}).then(function(carsData) {
-			equal(carsData.data.length, 7, 'One car less');
-			equal(carsData.data[1].name, '2013 Focus', 'Car actually deleted');
-		}).then(function() {
+	// $.ajax({ url: "/presetStore", method: "get", data: {year: 2013, modelId:1}, dataType: "json" })
 
-			return $.ajax({ url: "/cars", method: "post", dataType: "json", data: {
-				modelId: 3,
-				year: 2015,
-				name: "2015 Altima"
-			} });
-		}).then(function(saved) {
+	findAll().then(function(carsData) {
+		equal(carsData.data.length, 8, 'Got all cars');
+		return $.ajax({ url: "/cars/"+carsData.data[1].id, method: "DELETE", dataType: "json" });
+	}).then(function() {
+		return findAll();
+	}).then(function(carsData) {
+		equal(carsData.data.length, 7, 'One car less');
+		equal(carsData.data[1].name, '2013 Focus', 'Car actually deleted');
+	}).then(function() {
 
-			return $.ajax({ url: "/cars/"+saved.id, method: "put", dataType: "json", data: {
-				modelId: 3,
-				year: 2015,
-				name: '2015 Nissan Altima'
-			} });
-		}).then(function(updated) {
-			return findAll();
-		}).then(function (cars) {
-			equal(cars.data.length, 8, 'New car created');
-			start();
-		});
+		return $.ajax({ url: "/cars", method: "post", dataType: "json", data: {
+			modelId: 3,
+			year: 2015,
+			name: "2015 Altima"
+		} });
+	}).then(function(saved) {
+
+		return $.ajax({ url: "/cars/"+saved.id, method: "put", dataType: "json", data: {
+			modelId: 3,
+			year: 2015,
+			name: '2015 Nissan Altima'
+		} });
+	}).then(function(updated) {
+		return findAll();
+	}).then(function (cars) {
+		equal(cars.data.length, 8, 'New car created');
+		start();
 	});
+});
 
 
-	test("filtering works", function() {
+test("filtering works", function() {
 
-		var store = fixture.store(
-			[	{ state : 'CA', name : 'Casadina' },
-				{ state : 'NT', name : 'Alberny' }],
-			// David, make sure this is here!
-			{});
+	var store = fixture.store(
+		[	{ state : 'CA', name : 'Casadina' },
+			{ state : 'NT', name : 'Alberny' }],
+		// David, make sure this is here!
+		{});
 
-		fixture({
-			'GET /api/cities' : store.findAll,
+	fixture({
+		'GET /api/cities' : store.findAll,
+	});
+	stop();
+	$.getJSON('/api/cities?state=CA').then(function(data){
+		deepEqual(data, {
+			data: [{
+				state : 'CA',
+				name : 'Casadina'
+			}],
+			count: 1
 		});
-		stop();
-		$.getJSON('/api/cities?state=CA').then(function(data){
-			deepEqual(data, {
-				data: [{
-					state : 'CA',
-					name : 'Casadina'
-				}],
-				count: 1
-			});
-			next();
-		}, function(e){
-			ok(false, ""+e);
-			start()
-		});
+		next();
+	}, function(e){
+		ok(false, ""+e);
+		start()
+	});
 
-		function next(){
+	function next(){
 
-			var store =fixture.store([{
-				_id : 1,
-				name : 'Cheese City',
-				slug : 'cheese-city',
-				address : {
-					city : 'Casadina',
-					state : 'CA'
-				}
-			}, {
-				_id : 2,
-				name : 'Crab Barn',
-				slug : 'crab-barn',
-				address : {
-					city : 'Alberny',
-					state : 'NT'
-				}
-			}],{
+		var store =fixture.store([{
+			_id : 1,
+			name : 'Cheese City',
+			slug : 'cheese-city',
+			address : {
+				city : 'Casadina',
+				state : 'CA'
+			}
+		}, {
+			_id : 2,
+			name : 'Crab Barn',
+			slug : 'crab-barn',
+			address : {
+				city : 'Alberny',
+				state : 'NT'
+			}
+		}],{
 
-			});
+		});
 
-			fixture({
-				'GET /restaurants' : store.findAll
-			});
-			$.getJSON('/api/restaurants?address[city]=Alberny').then(function(responseData){
+		fixture({
+			'GET /restaurants' : store.findAll
+		});
+		$.getJSON('/api/restaurants?address[city]=Alberny').then(function(responseData){
 
-				deepEqual(responseData, {
-					count: 1,
-					data: [{
-						_id : 2,
-						name : 'Crab Barn',
-						slug : 'crab-barn',
-						address : {
-							city : 'Alberny',
-							state : 'NT'
-						}
-					}]
-				});
-				last();
-
-			}, function(e){
-				ok(false);
-				debugger;
-				start();
-			});
-		}
-		function last(){
-			var store =fixture.store([{
-				_id : 1,
-				name : 'Cheese City',
-				slug : 'cheese-city',
-				address : {
-					city : 'Casadina',
-					state : 'CA'
-				}
-			}, {
-				_id : 2,
-				name : 'Crab Barn',
-				slug : 'crab-barn',
-				address : {
-					city : 'Alberny',
-					state : 'NT'
-				}
-			}],{
-				"address.city": function(restaurantValue, paramValue, restaurant, params){
-					return restaurant.address.city === paramValue;
-				}
-			});
-			var responseData = store.findAll({data: {"address.city": "Alberny"}});
-
 			deepEqual(responseData, {
@@ -769,6 +725,64 @@ count: 1,
 			});
+			last();
+
+		}, function(e){
+			ok(false);
+			debugger;
 			start();
-		}
+		});
+	}
+	function last(){
+		var store =fixture.store([{
+			_id : 1,
+			name : 'Cheese City',
+			slug : 'cheese-city',
+			address : {
+				city : 'Casadina',
+				state : 'CA'
+			}
+		}, {
+			_id : 2,
+			name : 'Crab Barn',
+			slug : 'crab-barn',
+			address : {
+				city : 'Alberny',
+				state : 'NT'
+			}
+		}],{
+			"address.city": function(restaurantValue, paramValue, restaurant, params){
+				return restaurant.address.city === paramValue;
+			}
+		});
+		var responseData = store.findAll({data: {"address.city": "Alberny"}});
+
+		deepEqual(responseData, {
+			count: 1,
+			data: [{
+				_id : 2,
+				name : 'Crab Barn',
+				slug : 'crab-barn',
+				address : {
+					city : 'Alberny',
+					state : 'NT'
+				}
+			}]
+		});
+		start();
+	}
+});
+
+
+QUnit.test("onreadystatechange, event is passed", function(){
+	fixture("GET something", function(){
+		return {};
 	});
 
-
+	var xhr = new XMLHttpRequest();
+	xhr.open("GET", "something");
+	xhr.onreadystatechange = function(ev){
+		ok(ev.target != null, "the event object passed to onreadystatechange");
+		start();
+	};
+	xhr.send();
+	stop();
+});

No alert changes

Improved metrics

Lines of code

1523

increased by1.06%

Worsened metrics

Total package byte prevSize

47770

decreased by-0.48%

No dependency changes