removed support for fixture adapter. moved ember-data to devDependenc…

…y in bower
adopted-ember-addons · Apr 12, 2015 · 54e362a · 54e362a
1 parent 3271a25
commit 54e362a
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 18 deletions.
diff --git a/bower.json b/bower.json
@@ -15,13 +15,13 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "ember-data": "1.0.0-beta.16",
     "jquery-mockjax": "latest"
   },
   "ignore": [
     "**/.*",
     "node_modules",
     "bower_components",
+    "blueprints",
     "bower.json",
     "gruntfile.js",
     "package.json",
@@ -31,6 +31,7 @@
     "tests"
   ],
   "devDependencies": {
+    "ember-data": "1.0.0-beta.16",
     "chance": "latest",
     "qunit": "latest",
     "sinon": "http://sinonjs.org/releases/sinon-1.10.1.js",

diff --git a/dist/amd/factory-guy.js b/dist/amd/factory-guy.js
@@ -568,6 +568,7 @@ var FactoryGuy = {
       }
     }
   },
+
   /**
    Push fixture to model's FIXTURES array.
    Used when store's adapter is a DS.FixtureAdapter.
@@ -748,7 +749,9 @@ var MockUpdateRequest = function(url, model, mapFind, options) {
         this.responseText = response;
       }
 		} else {
-			var json = model.toJSON({includeId: true});
+      // need to serialize instead of toJSON for polymorphic associations
+			var json = model.serialize();
+      json.id = model.id;
 			this.responseText = mapFind(model.constructor.typeKey, json);
 			this.status = 200;
 		}
@@ -763,6 +766,7 @@ var MockUpdateRequest = function(url, model, mapFind, options) {
 
 	$.mockjax(requestConfig);
 };
+
 (function () {
   DS.Store.reopen({
     /**

diff --git a/dist/ember-data-factory-guy.js b/dist/ember-data-factory-guy.js
@@ -744,7 +744,9 @@ var MockUpdateRequest = function(url, model, mapFind, options) {
         this.responseText = response;
       }
 		} else {
-			var json = model.toJSON({includeId: true});
+      // need to serialize instead of toJSON for polymorphic associations
+			var json = model.serialize();
+      json.id = model.id;
 			this.responseText = mapFind(model.constructor.typeKey, json);
 			this.status = 200;
 		}
@@ -759,6 +761,7 @@ var MockUpdateRequest = function(url, model, mapFind, options) {
 
 	$.mockjax(requestConfig);
 };
+
 (function () {
   DS.Store.reopen({
     /**

diff --git a/dist/ember-data-factory-guy.min.js b/dist/ember-data-factory-guy.min.js
diff --git a/src/mock_update_request.js b/src/mock_update_request.js
@@ -32,7 +32,9 @@ var MockUpdateRequest = function(url, model, mapFind, options) {
         this.responseText = response;
       }
 		} else {
-			var json = model.toJSON({includeId: true});
+      // need to serialize instead of toJSON for polymorphic associations
+			var json = model.serialize();
+      json.id = model.id;
 			this.responseText = mapFind(model.constructor.typeKey, json);
 			this.status = 200;
 		}
@@ -46,4 +48,4 @@ var MockUpdateRequest = function(url, model, mapFind, options) {
 	};
 
 	$.mockjax(requestConfig);
-};
+};
diff --git a/tests/test_setup.js b/tests/test_setup.js
@@ -83,11 +83,6 @@ Project = DS.Model.extend({
   children: DS.hasMany('project', {inverse: 'parent'})
 });
 
-
-
-
-
-
 Property = DS.Model.extend({
   name:    DS.attr('string'),
   company: DS.belongsTo('company', {async: true}),

diff --git a/vendor/assets/javascripts/ember_data_factory_guy.js b/vendor/assets/javascripts/ember_data_factory_guy.js
@@ -563,6 +563,7 @@ var FactoryGuy = {
       }
     }
   },
+
   /**
    Push fixture to model's FIXTURES array.
    Used when store's adapter is a DS.FixtureAdapter.
@@ -743,7 +744,9 @@ var MockUpdateRequest = function(url, model, mapFind, options) {
         this.responseText = response;
       }
 		} else {
-			var json = model.toJSON({includeId: true});
+      // need to serialize instead of toJSON for polymorphic associations
+			var json = model.serialize();
+      json.id = model.id;
 			this.responseText = mapFind(model.constructor.typeKey, json);
 			this.status = 200;
 		}
@@ -758,6 +761,7 @@ var MockUpdateRequest = function(url, model, mapFind, options) {
 
 	$.mockjax(requestConfig);
 };
+
 (function () {
   DS.Store.reopen({
     /**
@@ -1338,12 +1342,10 @@ if (FactoryGuy !== undefined) {
 				return null;
 			}
 		}
+
 		// Inspect the data submitted in the request (either POST body or GET query string)
 		if ( handler.data ) {
-//      console.log('request.data', requestSettings.data )
-//      console.log('handler.data', handler.data )
-//      console.log('data equal', isMockDataEqual(handler.data, requestSettings.data) )
-			if  ( ! requestSettings.data || !isMockDataEqual(handler.data, requestSettings.data) ) {
+			if ( ! requestSettings.data || !isMockDataEqual(handler.data, requestSettings.data) ) {
 				// They're not identical, do not mock this request
 				return null;
 			}
@@ -1354,6 +1356,7 @@ if (FactoryGuy !== undefined) {
 			// The request type doesn't match (GET vs. POST)
 			return null;
 		}
+
 		return handler;
 	}
 
@@ -1717,7 +1720,6 @@ if (FactoryGuy !== undefined) {
 			}
 
 			mockHandler = getMockForRequest( mockHandlers[k], requestSettings );
-
 			if(!mockHandler) {
 				// No valid mock found for this request
 				continue;
@@ -1769,7 +1771,7 @@ if (FactoryGuy !== undefined) {
 			}
 
 			copyUrlParameters(mockHandler, origSettings);
-		 	//console.log('here copyUrlParameters', 'mockHandler=>',mockHandler, 'requestSettings=>',requestSettings, 'origSettings=>',origSettings)
+
 			(function(mockHandler, requestSettings, origSettings, origHandler) {
 
 				mockRequest = _ajax.call($, $.extend(true, {}, origSettings, {