ember-data-factory-guy 0.9.2 → 0.9.3

data/dist/ember-data-factory-guy.min.js

@@ -1 +1 @@
-var Sequence=function(fn){var index=1;this.next=function(){return fn.call(this,index++)};this.reset=function(){index=1}};var MissingSequenceError=function(message){this.toString=function(){return message}};if(FactoryGuy!==undefined){FactoryGuy.sequence=Sequence;FactoryGuy.missingSequenceError=MissingSequenceError}var ModelDefinition=function(model,config){var sequences={};var traits={};var defaultAttributes={};var namedModels={};var modelId=1;var sequenceName=null;this.model=model;this.matchesName=function(name){return model==name||namedModels[name]};this.nextId=function(){return modelId++};this.generate=function(name,sequenceFn){if(sequenceFn){if(!sequences[name]){sequences[name]=new Sequence(sequenceFn)}}var sequence=sequences[name];if(!sequence){throw new MissingSequenceError("Can not find that sequence named ["+sequenceName+"] in '"+model+"' definition")}return sequence.next()};this.build=function(name,opts,traitArgs){var traitsObj={};traitArgs.forEach(function(trait){$.extend(traitsObj,traits[trait])});var modelAttributes=namedModels[name]||{};var fixture=$.extend({},defaultAttributes,modelAttributes,traitsObj,opts);for(var attribute in fixture){if(Ember.typeOf(fixture[attribute])=="function"){fixture[attribute]=fixture[attribute].call(this,fixture)}else if(Ember.typeOf(fixture[attribute])=="object"){if(FactoryGuy.getStore()){if(FactoryGuy.isAttributeRelationship(this.model,attribute)){fixture[attribute]=FactoryGuy.build(attribute,fixture[attribute])}}else{fixture[attribute]=FactoryGuy.build(attribute,fixture[attribute])}}}if(!fixture.id){fixture.id=this.nextId()}return fixture};this.buildList=function(name,number,traits,opts){var arr=[];for(var i=0;i<number;i++){arr.push(this.build(name,opts,traits))}return arr};this.reset=function(){modelId=1;for(var name in sequences){sequences[name].reset()}};var parseDefault=function(object){if(!object){return}defaultAttributes=object};var parseTraits=function(object){if(!object){return}traits=object};var parseSequences=function(object){if(!object){return}for(sequenceName in object){var sequenceFn=object[sequenceName];if(Ember.typeOf(sequenceFn)!="function"){throw new Error("Problem with ["+sequenceName+"] sequence definition. Sequences must be functions")}object[sequenceName]=new Sequence(sequenceFn)}sequences=object};var parseConfig=function(config){parseSequences(config.sequences);delete config.sequences;parseTraits(config.traits);delete config.traits;parseDefault(config.default);delete config.default;namedModels=config};parseConfig(config)};if(FactoryGuy!==undefined){FactoryGuy.modelDefiniton=ModelDefinition}var FactoryGuy={modelDefinitions:{},define:function(model,config){if(this.modelDefinitions[model]){this.modelDefinitions[model].merge(config)}else{this.modelDefinitions[model]=new ModelDefinition(model,config)}},setStore:function(store){Ember.assert("FactoryGuy#setStore needs a valid store instance.You passed in ["+store+"]",store instanceof DS.Store);this.store=store},getStore:function(){return this.store},isAttributeRelationship:function(typeName,attribute){if(!this.store){Ember.debug("FactoryGuy does not have the application's store. Use FactoryGuy.setStore(store) before making any fixtures");return true}var model=this.store.modelFor(typeName);return!!model.typeForRelationship(attribute)},generate:function(nameOrFunction){var sortaRandomName=Math.floor((1+Math.random())*65536).toString(16)+Date.now();return function(){if(Em.typeOf(nameOrFunction)=="function"){return this.generate(sortaRandomName,nameOrFunction)}else{return this.generate(nameOrFunction)}}},belongsTo:function(fixtureName,opts){return function(){return FactoryGuy.build(fixtureName,opts)}},association:function(fixtureName,opts){Ember.deprecate("DEPRECATION Warning: use FactoryGuy.belongsTo instead");return this.belongsTo(fixtureName,opts)},hasMany:function(fixtureName,number,opts){return function(){return FactoryGuy.buildList(fixtureName,number,opts)}},lookupModelForFixtureName:function(name){var definition=this.lookupDefinitionForFixtureName(name);if(definition){return definition.model}},lookupDefinitionForFixtureName:function(name){for(var model in this.modelDefinitions){var definition=this.modelDefinitions[model];if(definition.matchesName(name)){return definition}}},build:function(){var args=Array.prototype.slice.call(arguments);var opts={};var name=args.shift();if(!name){throw new Error("Build needs a factory name to build")}if(Ember.typeOf(args[args.length-1])=="object"){opts=args.pop()}var traits=args;var definition=this.lookupDefinitionForFixtureName(name);if(!definition){throw new Error("Can't find that factory named ["+name+"]")}return definition.build(name,opts,traits)},buildList:function(){var args=Array.prototype.slice.call(arguments);var name=args.shift();var number=args.shift();if(!name||!number){throw new Error("buildList needs a name and a number ( at least ) to build with")}var opts={};if(Ember.typeOf(args[args.length-1])=="object"){opts=args.pop()}var traits=args;var definition=this.lookupDefinitionForFixtureName(name);if(!definition){throw new Error("Can't find that factory named ["+name+"]")}return definition.buildList(name,number,traits,opts)},make:function(){var store=this.store;Ember.assert("FactoryGuy does not have the application's store. Use FactoryGuy.setStore(store) before making any fixtures",store);var fixture=this.build.apply(this,arguments);var name=arguments[0];var modelName=this.lookupModelForFixtureName(name);var modelType=store.modelFor(modelName);if(store.usingFixtureAdapter()){store.setAssociationsForFixtureAdapter(modelType,modelName,fixture);return this.pushFixture(modelType,fixture)}else{return store.makeModel(modelType,fixture)}},makeList:function(){Ember.assert("FactoryGuy does not have the application's store. Use FactoryGuy.setStore(store) before making any fixtures",this.store);var arr=[];var args=Array.prototype.slice.call(arguments);Ember.assert("makeList needs at least 2 arguments, a name and a number",args.length>=2);var number=args.splice(1,1)[0];Ember.assert("Second argument to makeList should be a number (of fixtures to make.)",typeof number=="number");for(var i=0;i<number;i++){arr.push(this.make.apply(this,args))}return arr},resetModels:function(store){for(var model in this.modelDefinitions){var definition=this.modelDefinitions[model];definition.reset();try{var modelType=store.modelFor(definition.model);if(store.usingFixtureAdapter()){modelType.FIXTURES=[]}store.unloadAll(modelType)}catch(e){console.log("resetModels",e)}}},pushFixture:function(modelClass,fixture){var index;if(!modelClass.FIXTURES){modelClass.FIXTURES=[]}index=this.indexOfFixture(modelClass.FIXTURES,fixture);if(index>-1){modelClass.FIXTURES.splice(index,1)}modelClass.FIXTURES.push(fixture);return fixture},indexOfFixture:function(fixtures,fixture){var index=-1,id=fixture.id+"";Ember.A(fixtures).find(function(r,i){if(""+Ember.get(r,"id")===id){index=i;return true}else{return false}});return index},clear:function(opts){if(!opts){this.modelDefinitions={}}}};(function(){DS.Store.reopen({usingFixtureAdapter:function(){var adapter=this.adapterFor("application");return adapter instanceof DS.FixtureAdapter},makeFixture:function(){Ember.deprecate("DEPRECATION Warning: use FactoryGuy.make instead");FactoryGuy.make.call(FactoryGuy,arguments)},makeList:function(){Ember.deprecate("DEPRECATION Warning: use FactoryGuy.makeList instead");FactoryGuy.makeList.call(FactoryGuy,arguments)},makeModel:function(modelType,fixture){var store=this,modelName=store.modelFor(modelType).typeKey,model;Em.run(function(){store.findEmbeddedAssociationsForRESTAdapter(modelType,fixture);if(fixture.type){modelName=fixture.type.underscore();modelType=store.modelFor(modelName)}model=store.push(modelName,fixture);store.setAssociationsForRESTAdapter(modelType,modelName,model)});return model},setAssociationsForFixtureAdapter:function(modelType,modelName,fixture){var self=this;var adapter=this.adapterFor("application");Ember.get(modelType,"relationshipsByName").forEach(function(relationship,name){if(relationship.kind=="hasMany"){var hasManyRelation=fixture[relationship.key];if(hasManyRelation){$.each(fixture[relationship.key],function(index,object){var id=object;if(Ember.typeOf(object)=="object"){id=object.id;hasManyRelation[index]=id}var hasManyfixtures=adapter.fixturesForType(relationship.type);var fixture=adapter.findFixtureById(hasManyfixtures,id);fixture[modelName]=fixture.id})}}if(relationship.kind=="belongsTo"){var belongsToRecord=fixture[relationship.key];if(belongsToRecord){if(typeof belongsToRecord=="object"){FactoryGuy.pushFixture(relationship.type,belongsToRecord);fixture[relationship.key]=belongsToRecord.id}var hasManyName=self.findHasManyRelationshipNameForFixtureAdapter(relationship.type,relationship.parentType);var belongsToFixtures=adapter.fixturesForType(relationship.type);var belongsTofixture=adapter.findFixtureById(belongsToFixtures,fixture[relationship.key]);if(!belongsTofixture[hasManyName]){belongsTofixture[hasManyName]=[]}belongsTofixture[hasManyName].push(fixture.id)}}})},findEmbeddedAssociationsForRESTAdapter:function(modelType,fixture){var store=this;Ember.get(modelType,"relationshipsByName").forEach(function(relationship,name){if(relationship.kind=="belongsTo"){var belongsToRecord=fixture[relationship.key];if(Ember.typeOf(belongsToRecord)=="object"){store.findEmbeddedAssociationsForRESTAdapter(relationship.type,belongsToRecord);belongsToRecord=store.push(relationship.type,belongsToRecord);fixture[relationship.key]=belongsToRecord}}if(relationship.kind=="hasMany"){var hasManyRecords=fixture[relationship.key];if(Ember.typeOf(hasManyRecords)=="array"){if(Ember.typeOf(hasManyRecords[0])=="object"){var records=Em.A();hasManyRecords.map(function(object){store.findEmbeddedAssociationsForRESTAdapter(relationship.type,object);var record=store.push(relationship.type,object);records.push(record);return record});fixture[relationship.key]=records}}}})},setAssociationsForRESTAdapter:function(modelType,modelName,model){var self=this;Ember.get(modelType,"relationshipsByName").forEach(function(relationship,name){if(relationship.kind=="hasMany"){var children=model.get(name)||[];children.forEach(function(child){var belongsToName=self.findRelationshipName("belongsTo",child.constructor,model);if(belongsToName){child.set(belongsToName,model)}})}})},findRelationshipName:function(kind,belongToModelType,childModel){var relationshipName;Ember.get(belongToModelType,"relationshipsByName").forEach(function(relationship,name){if(relationship.kind==kind&&childModel instanceof relationship.type){relationshipName=relationship.key}});return relationshipName},findHasManyRelationshipNameForFixtureAdapter:function(belongToModelType,childModelType){var relationshipName;Ember.get(belongToModelType,"relationshipsByName").forEach(function(relationship,name){if(relationship.kind=="hasMany"&&childModelType==relationship.type){relationshipName=relationship.key}});return relationshipName},pushPayload:function(type,payload){if(this.usingFixtureAdapter()){var model=this.modelFor(type);FactoryGuy.pushFixture(model,payload)}else{this._super(type,payload)}}})})();var FactoryGuyTestMixin=Em.Mixin.create({setup:function(app){this.set("container",app.__container__);FactoryGuy.setStore(this.getStore());return this},useFixtureAdapter:function(app){app.ApplicationAdapter=DS.FixtureAdapter;this.getStore().adapterFor("application").simulateRemoteResponse=false},usingActiveModelSerializer:function(type){var store=this.getStore();var modelType=store.modelFor(type);var serializer=store.serializerFor(modelType.typeKey);return serializer instanceof DS.ActiveModelSerializer},find:function(type,id){return this.getStore().find(type,id)},make:function(){return FactoryGuy.make.apply(FactoryGuy,arguments)},getStore:function(){return this.get("container").lookup("store:main")},stubEndpointForHttpRequest:function(url,json,options){options=options||{};var request={url:url,dataType:"json",responseText:json,type:options.type||"GET",status:options.status||200};if(options.urlParams){request.urlParams=options.urlParams}if(options.data){request.data=options.data}$.mockjax(request)},buildURL:function(typeName,id){var type=this.getStore().modelFor(typeName);return this.getStore().adapterFor(type).buildURL(type.typeKey,id)},handleFindMany:function(){FactoryGuy.makeList.apply(FactoryGuy,arguments);var name=arguments[0];var modelName=FactoryGuy.lookupModelForFixtureName(name);var responseJson={};responseJson[modelName]=[];var url=this.buildURL(modelName);this.stubEndpointForHttpRequest(url,responseJson)},handleFindQuery:function(modelName,searchParams,json){var responseJson={};responseJson[modelName.pluralize()]=json;var url=this.buildURL(modelName);this.stubEndpointForHttpRequest(url,responseJson,{urlParams:searchParams})},handleCreate:function(modelName,options){var opts=options===undefined?{}:options;var succeed=opts.succeed===undefined?true:opts.succeed;var match=opts.match||{};var returnArgs=opts.returns||{};var url=this.buildURL(modelName);var definition=FactoryGuy.modelDefinitions[modelName];var httpOptions={type:"POST"};if(opts.match){var expectedRequest={};var record=this.getStore().createRecord(modelName,match);expectedRequest[modelName]=record.serialize();httpOptions.data=JSON.stringify(expectedRequest)}var modelType=this.getStore().modelFor(modelName);var responseJson={};if(succeed){responseJson[modelName]=$.extend({id:definition.nextId()},match,returnArgs);Ember.get(modelType,"relationshipsByName").forEach(function(relationship){if(relationship.kind=="belongsTo"){delete responseJson[modelName][relationship.key]}})}else{httpOptions.status=500}this.stubEndpointForHttpRequest(url,responseJson,httpOptions)},handleUpdate:function(){var args=Array.prototype.slice.call(arguments);Ember.assert("To handleUpdate pass in a model instance or a type and an id",args.length>0);var succeed=true;if(typeof args[args.length-1]=="boolean"){args.pop();succeed=false}Ember.assert("To handleUpdate pass in a model instance or a type and an id",args.length>0);var type,id;if(args[0]instanceof DS.Model){var model=args[0];type=model.constructor.typeKey;id=model.id}else if(typeof args[0]=="string"&&typeof parseInt(args[1])=="number"){type=args[0];id=args[1]}Ember.assert("To handleUpdate pass in a model instance or a type and an id",type&&id);this.stubEndpointForHttpRequest(this.buildURL(type,id),{},{type:"PUT",status:succeed?200:500})},handleDelete:function(type,id,succeed){succeed=succeed===undefined?true:succeed;this.stubEndpointForHttpRequest(this.buildURL(type,id),{},{type:"DELETE",status:succeed?200:500})},teardown:function(){FactoryGuy.resetModels(this.getStore());$.mockjax.clear()}});if(FactoryGuy!==undefined){FactoryGuy.testMixin=FactoryGuyTestMixin}
+var Sequence=function(fn){var index=1;this.next=function(){return fn.call(this,index++)};this.reset=function(){index=1}};var MissingSequenceError=function(message){this.toString=function(){return message}};if(FactoryGuy!==undefined){FactoryGuy.sequence=Sequence;FactoryGuy.missingSequenceError=MissingSequenceError}var ModelDefinition=function(model,config){var sequences={};var traits={};var defaultAttributes={};var namedModels={};var modelId=1;var sequenceName=null;this.model=model;this.matchesName=function(name){return model==name||namedModels[name]};this.nextId=function(){return modelId++};this.generate=function(name,sequenceFn){if(sequenceFn){if(!sequences[name]){sequences[name]=new Sequence(sequenceFn)}}var sequence=sequences[name];if(!sequence){throw new MissingSequenceError("Can not find that sequence named ["+sequenceName+"] in '"+model+"' definition")}return sequence.next()};this.build=function(name,opts,traitArgs){var traitsObj={};traitArgs.forEach(function(trait){$.extend(traitsObj,traits[trait])});var modelAttributes=namedModels[name]||{};var fixture=$.extend({},defaultAttributes,modelAttributes,traitsObj,opts);for(var attribute in fixture){if(Ember.typeOf(fixture[attribute])=="function"){fixture[attribute]=fixture[attribute].call(this,fixture)}else if(Ember.typeOf(fixture[attribute])=="object"){if(FactoryGuy.getStore()){if(FactoryGuy.isAttributeRelationship(this.model,attribute)){fixture[attribute]=FactoryGuy.build(attribute,fixture[attribute])}}else{fixture[attribute]=FactoryGuy.build(attribute,fixture[attribute])}}}if(!fixture.id){fixture.id=this.nextId()}return fixture};this.buildList=function(name,number,traits,opts){var arr=[];for(var i=0;i<number;i++){arr.push(this.build(name,opts,traits))}return arr};this.reset=function(){modelId=1;for(var name in sequences){sequences[name].reset()}};var parseDefault=function(object){if(!object){return}defaultAttributes=object};var parseTraits=function(object){if(!object){return}traits=object};var parseSequences=function(object){if(!object){return}for(sequenceName in object){var sequenceFn=object[sequenceName];if(Ember.typeOf(sequenceFn)!="function"){throw new Error("Problem with ["+sequenceName+"] sequence definition. Sequences must be functions")}object[sequenceName]=new Sequence(sequenceFn)}sequences=object};var parseConfig=function(config){parseSequences(config.sequences);delete config.sequences;parseTraits(config.traits);delete config.traits;parseDefault(config.default);delete config.default;namedModels=config};parseConfig(config)};if(FactoryGuy!==undefined){FactoryGuy.modelDefiniton=ModelDefinition}var FactoryGuy={modelDefinitions:{},define:function(model,config){if(this.modelDefinitions[model]){this.modelDefinitions[model].merge(config)}else{this.modelDefinitions[model]=new ModelDefinition(model,config)}},setStore:function(store){Ember.assert("FactoryGuy#setStore needs a valid store instance.You passed in ["+store+"]",store instanceof DS.Store);this.store=store},getStore:function(){return this.store},isAttributeRelationship:function(typeName,attribute){if(!this.store){Ember.debug("FactoryGuy does not have the application's store. Use FactoryGuy.setStore(store) before making any fixtures");return true}var model=this.store.modelFor(typeName);return!!model.typeForRelationship(attribute)},generate:function(nameOrFunction){var sortaRandomName=Math.floor((1+Math.random())*65536).toString(16)+Date.now();return function(){if(Em.typeOf(nameOrFunction)=="function"){return this.generate(sortaRandomName,nameOrFunction)}else{return this.generate(nameOrFunction)}}},belongsTo:function(fixtureName,opts){return function(){return FactoryGuy.build(fixtureName,opts)}},association:function(fixtureName,opts){Ember.deprecate("DEPRECATION Warning: use FactoryGuy.belongsTo instead");return this.belongsTo(fixtureName,opts)},hasMany:function(fixtureName,number,opts){return function(){return FactoryGuy.buildList(fixtureName,number,opts)}},lookupModelForFixtureName:function(name){var definition=this.lookupDefinitionForFixtureName(name);if(definition){return definition.model}},lookupDefinitionForFixtureName:function(name){for(var model in this.modelDefinitions){var definition=this.modelDefinitions[model];if(definition.matchesName(name)){return definition}}},build:function(){var args=Array.prototype.slice.call(arguments);var opts={};var name=args.shift();if(!name){throw new Error("Build needs a factory name to build")}if(Ember.typeOf(args[args.length-1])=="object"){opts=args.pop()}var traits=args;var definition=this.lookupDefinitionForFixtureName(name);if(!definition){throw new Error("Can't find that factory named ["+name+"]")}return definition.build(name,opts,traits)},buildList:function(){var args=Array.prototype.slice.call(arguments);var name=args.shift();var number=args.shift();if(!name||!number){throw new Error("buildList needs a name and a number ( at least ) to build with")}var opts={};if(Ember.typeOf(args[args.length-1])=="object"){opts=args.pop()}var traits=args;var definition=this.lookupDefinitionForFixtureName(name);if(!definition){throw new Error("Can't find that factory named ["+name+"]")}return definition.buildList(name,number,traits,opts)},make:function(){var store=this.store;Ember.assert("FactoryGuy does not have the application's store. Use FactoryGuy.setStore(store) before making any fixtures",store);var fixture=this.build.apply(this,arguments);var name=arguments[0];var modelName=this.lookupModelForFixtureName(name);var modelType=store.modelFor(modelName);if(store.usingFixtureAdapter()){store.setAssociationsForFixtureAdapter(modelType,modelName,fixture);fixture=FactoryGuy.pushFixture(modelType,fixture);store.loadModelForFixtureAdapter(modelType,fixture);return fixture}else{return store.makeModel(modelType,fixture)}},makeList:function(){Ember.assert("FactoryGuy does not have the application's store. Use FactoryGuy.setStore(store) before making any fixtures",this.store);var arr=[];var args=Array.prototype.slice.call(arguments);Ember.assert("makeList needs at least 2 arguments, a name and a number",args.length>=2);var number=args.splice(1,1)[0];Ember.assert("Second argument to makeList should be a number (of fixtures to make.)",typeof number=="number");for(var i=0;i<number;i++){arr.push(this.make.apply(this,args))}return arr},resetModels:function(store){for(var model in this.modelDefinitions){var definition=this.modelDefinitions[model];definition.reset();try{var modelType=store.modelFor(definition.model);if(store.usingFixtureAdapter()){modelType.FIXTURES=[]}store.unloadAll(modelType)}catch(e){console.log("resetModels",e)}}},pushFixture:function(modelClass,fixture){var index;if(!modelClass.FIXTURES){modelClass.FIXTURES=[]}index=this.indexOfFixture(modelClass.FIXTURES,fixture);if(index>-1){modelClass.FIXTURES.splice(index,1)}modelClass.FIXTURES.push(fixture);return fixture},indexOfFixture:function(fixtures,fixture){var index=-1,id=fixture.id+"";Ember.A(fixtures).find(function(r,i){if(""+Ember.get(r,"id")===id){index=i;return true}else{return false}});return index},clear:function(opts){if(!opts){this.modelDefinitions={}}}};(function(){DS.Store.reopen({usingFixtureAdapter:function(){var adapter=this.adapterFor("application");return adapter instanceof DS.FixtureAdapter},makeFixture:function(){Ember.deprecate("DEPRECATION Warning: use FactoryGuy.make instead");FactoryGuy.make.call(FactoryGuy,arguments)},makeList:function(){Ember.deprecate("DEPRECATION Warning: use FactoryGuy.makeList instead");FactoryGuy.makeList.call(FactoryGuy,arguments)},makeModel:function(modelType,fixture){var store=this,modelName=store.modelFor(modelType).typeKey,model;Em.run(function(){store.findEmbeddedAssociationsForRESTAdapter(modelType,fixture);if(fixture.type){modelName=fixture.type.underscore();modelType=store.modelFor(modelName)}model=store.push(modelName,fixture);store.setAssociationsForRESTAdapter(modelType,modelName,model)});return model},setAssociationsForFixtureAdapter:function(modelType,modelName,fixture){var self=this;var adapter=this.adapterFor("application");Ember.get(modelType,"relationshipsByName").forEach(function(relationship,name){var hasManyRelation,belongsToRecord;if(relationship.kind=="hasMany"){hasManyRelation=fixture[relationship.key];if(hasManyRelation){$.each(fixture[relationship.key],function(index,object){var id=object;if(Ember.typeOf(object)=="object"){FactoryGuy.pushFixture(relationship.type,object);id=object.id;hasManyRelation[index]=id}var hasManyfixtures=adapter.fixturesForType(relationship.type);var hasManyFixture=adapter.findFixtureById(hasManyfixtures,id);hasManyFixture[modelName]=fixture.id;self.loadModelForFixtureAdapter(relationship.type,hasManyFixture)})}}if(relationship.kind=="belongsTo"){belongsToRecord=fixture[relationship.key];if(belongsToRecord){if(typeof belongsToRecord=="object"){FactoryGuy.pushFixture(relationship.type,belongsToRecord);fixture[relationship.key]=belongsToRecord.id}var hasManyName=self.findHasManyRelationshipNameForFixtureAdapter(relationship.type,relationship.parentType);var belongsToFixtures=adapter.fixturesForType(relationship.type);var belongsTofixture=adapter.findFixtureById(belongsToFixtures,fixture[relationship.key]);if(!belongsTofixture[hasManyName]){belongsTofixture[hasManyName]=[]}belongsTofixture[hasManyName].push(fixture.id);self.loadModelForFixtureAdapter(relationship.type,belongsTofixture)}}})},loadModelForFixtureAdapter:function(modelType,fixture){var storeModel=this.getById(modelType,fixture.id),that=this;if(!Ember.isPresent(storeModel)||storeModel.get("isEmpty")){Ember.run(function(){var dup=Ember.copy(fixture,true);that.push(modelType,fixture);Ember.get(modelType,"relationshipsByName").forEach(function(relationship,name){if(fixture[relationship.key]){fixture[relationship.key]=dup[relationship.key]}})})}},findEmbeddedAssociationsForRESTAdapter:function(modelType,fixture){var store=this;Ember.get(modelType,"relationshipsByName").forEach(function(relationship,name){if(relationship.kind=="belongsTo"){var belongsToRecord=fixture[relationship.key];if(Ember.typeOf(belongsToRecord)=="object"){store.findEmbeddedAssociationsForRESTAdapter(relationship.type,belongsToRecord);belongsToRecord=store.push(relationship.type,belongsToRecord);fixture[relationship.key]=belongsToRecord}}if(relationship.kind=="hasMany"){var hasManyRecords=fixture[relationship.key];if(Ember.typeOf(hasManyRecords)=="array"){if(Ember.typeOf(hasManyRecords[0])=="object"){var records=Em.A();hasManyRecords.map(function(object){store.findEmbeddedAssociationsForRESTAdapter(relationship.type,object);var record=store.push(relationship.type,object);records.push(record);return record});fixture[relationship.key]=records}}}})},setAssociationsForRESTAdapter:function(modelType,modelName,model){var self=this;Ember.get(modelType,"relationshipsByName").forEach(function(relationship,name){if(relationship.kind=="hasMany"){var children=model.get(name)||[];children.forEach(function(child){var belongsToName=self.findRelationshipName("belongsTo",child.constructor,model);if(belongsToName){child.set(belongsToName,model)}})}})},findRelationshipName:function(kind,belongToModelType,childModel){var relationshipName;Ember.get(belongToModelType,"relationshipsByName").forEach(function(relationship,name){if(relationship.kind==kind&&childModel instanceof relationship.type){relationshipName=relationship.key}});return relationshipName},findHasManyRelationshipNameForFixtureAdapter:function(belongToModelType,childModelType){var relationshipName;Ember.get(belongToModelType,"relationshipsByName").forEach(function(relationship,name){if(relationship.kind=="hasMany"&&childModelType==relationship.type){relationshipName=relationship.key}});return relationshipName},pushPayload:function(type,payload){var typeName,model;if(this.usingFixtureAdapter()){if(Ember.typeOf(type)==="string"&&Ember.isPresent(payload)&&Ember.isPresent(payload.id)){model=this.modelFor(type);FactoryGuy.pushFixture(model,payload);this.push(model,Ember.copy(payload,true))}else if(Ember.typeOf(type)==="object"||Ember.typeOf(payload)==="object"){if(Ember.isBlank(payload)){payload=type}for(var prop in payload){typeName=Ember.String.camelize(Ember.String.singularize(prop));model=this.modelFor(typeName);this.pushMany(model,Ember.makeArray(Ember.copy(payload[prop],true)));Ember.ArrayPolyfills.forEach.call(Ember.makeArray(payload[prop]),function(hash){FactoryGuy.pushFixture(model,hash)},this)}}else{throw new Ember.Error("Assertion Failed: You cannot use `store#pushPayload` with this method signature pushPayload("+type+","+payload+")")}}else{this._super(type,payload)}}})})();var FactoryGuyTestMixin=Em.Mixin.create({setup:function(app){this.set("container",app.__container__);FactoryGuy.setStore(this.getStore());return this},useFixtureAdapter:function(app){app.ApplicationAdapter=DS.FixtureAdapter;this.getStore().adapterFor("application").simulateRemoteResponse=false},usingActiveModelSerializer:function(type){var store=this.getStore();var modelType=store.modelFor(type);var serializer=store.serializerFor(modelType.typeKey);return serializer instanceof DS.ActiveModelSerializer},find:function(type,id){return this.getStore().find(type,id)},make:function(){return FactoryGuy.make.apply(FactoryGuy,arguments)},getStore:function(){return this.get("container").lookup("store:main")},stubEndpointForHttpRequest:function(url,json,options){options=options||{};var request={url:url,dataType:"json",responseText:json,type:options.type||"GET",status:options.status||200};if(options.urlParams){request.urlParams=options.urlParams}if(options.data){request.data=options.data}$.mockjax(request)},buildURL:function(typeName,id){var type=this.getStore().modelFor(typeName);return this.getStore().adapterFor(type).buildURL(type.typeKey,id)},handleFindMany:function(){var records=FactoryGuy.makeList.apply(FactoryGuy,arguments);var name=arguments[0];var modelName=FactoryGuy.lookupModelForFixtureName(name);var responseJson={};var json=records.map(function(record){return record.toJSON({includeId:true})});responseJson[modelName.pluralize()]=json;var url=this.buildURL(modelName);this.stubEndpointForHttpRequest(url,responseJson)},handleFindQuery:function(modelName,searchParams,records){Ember.assert("The second argument of searchParams must be an array",Em.typeOf(searchParams)=="array");if(records){Ember.assert("The third argument ( records ) must be an array - found type:"+Em.typeOf(records),Em.typeOf(records)=="array")}else{records=[]}var json=records.map(function(record){return record.toJSON({includeId:true})});var responseJson={};responseJson[modelName.pluralize()]=json;var url=this.buildURL(modelName);this.stubEndpointForHttpRequest(url,responseJson,{urlParams:searchParams})},handleCreate:function(modelName,options){var opts=options===undefined?{}:options;var succeed=opts.succeed===undefined?true:opts.succeed;var match=opts.match||{};var returnArgs=opts.returns||{};var url=this.buildURL(modelName);var definition=FactoryGuy.modelDefinitions[modelName];var httpOptions={type:"POST"};if(opts.match){var expectedRequest={};var record=this.getStore().createRecord(modelName,match);expectedRequest[modelName]=record.serialize();httpOptions.data=JSON.stringify(expectedRequest)}var modelType=this.getStore().modelFor(modelName);var responseJson={};if(succeed){responseJson[modelName]=$.extend({id:definition.nextId()},match,returnArgs);Ember.get(modelType,"relationshipsByName").forEach(function(relationship){if(relationship.kind=="belongsTo"){delete responseJson[modelName][relationship.key]}})}else{httpOptions.status=500}this.stubEndpointForHttpRequest(url,responseJson,httpOptions)},handleUpdate:function(){var args=Array.prototype.slice.call(arguments);Ember.assert("To handleUpdate pass in a model instance or a type and an id",args.length>0);var succeed=true;if(typeof args[args.length-1]=="boolean"){args.pop();succeed=false}Ember.assert("To handleUpdate pass in a model instance or a type and an id",args.length>0);var type,id;if(args[0]instanceof DS.Model){var model=args[0];type=model.constructor.typeKey;id=model.id}else if(typeof args[0]=="string"&&typeof parseInt(args[1])=="number"){type=args[0];id=args[1]}Ember.assert("To handleUpdate pass in a model instance or a type and an id",type&&id);this.stubEndpointForHttpRequest(this.buildURL(type,id),{},{type:"PUT",status:succeed?200:500})},handleDelete:function(type,id,succeed){succeed=succeed===undefined?true:succeed;this.stubEndpointForHttpRequest(this.buildURL(type,id),{},{type:"DELETE",status:succeed?200:500})},teardown:function(){FactoryGuy.resetModels(this.getStore());$.mockjax.clear()}});if(FactoryGuy!==undefined){FactoryGuy.testMixin=FactoryGuyTestMixin}

data/ember-data-factory-guy.gemspec

@@ -1,7 +1,11 @@
 # -*- encoding: utf-8 -*-
+require 'json'
+
+package = JSON.parse(File.read('package.json'))
+
 Gem::Specification.new do |s|
   s.name        = "ember-data-factory-guy"
-  s.version     = "0.9.2"
+  s.version     = package["version"]
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Daniel Sudol", "Alex Opak"]
   s.email       = ["dansudol@yahoo.com", "opak.alexandr@gmail.com"]

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-data-factory-guy",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "authors": [
     "Daniel Sudol <dansudol@yahoo.com>",
     "Opak Alex <opak.alexandr@gmail.com>"

data/src/factory_guy.js

@@ -284,7 +284,9 @@ var FactoryGuy = {
 
     if (store.usingFixtureAdapter()) {
       store.setAssociationsForFixtureAdapter(modelType, modelName, fixture);
-      return this.pushFixture(modelType, fixture);
+      fixture = FactoryGuy.pushFixture(modelType, fixture);
+      store.loadModelForFixtureAdapter(modelType, fixture);
+      return fixture;
     } else {
       return store.makeModel(modelType, fixture);
     }

data/src/factory_guy_test_mixin.js

@@ -77,6 +77,17 @@ var FactoryGuyTestMixin = Em.Mixin.create({
      Handling ajax GET for finding all records for a type of model.
      You can mock failed find by passing in success argument as false.
 
+   ```js
+     // Pass in the parameters you would normally pass into FactoryGuy.makeList,
+     // like fixture name, number of fixtures to make, and optional traits,
+     // or fixture options
+     testHelper.handleFindMany('user', 2, 'with_hats');
+
+     store.find('user').then(function(users){
+
+     });
+   ```
+
      @param {String} name  name of the fixture ( or model ) to find
      @param {Number} number  number of fixtures to create
      @param {String} trait  optional traits (one or more)
@@ -84,39 +95,54 @@ var FactoryGuyTestMixin = Em.Mixin.create({
    */
   handleFindMany: function () {
     // make the records and load them in the store
-    FactoryGuy.makeList.apply(FactoryGuy, arguments);
+    var records = FactoryGuy.makeList.apply(FactoryGuy, arguments);
     var name = arguments[0];
     var modelName = FactoryGuy.lookupModelForFixtureName(name);
     var responseJson = {};
-    responseJson[modelName] = [];
+    var json = records.map(function(record) {return record.toJSON({includeId: true})});
+    responseJson[modelName.pluralize()] = json;
     var url = this.buildURL(modelName);
-    // mock the ajax call, but return nothing, since the records will be
-    // retrieved from the store where they were just loaded above
     this.stubEndpointForHttpRequest(url, responseJson);
   },
   /**
    Handling ajax GET for finding all records for a type of model with query parameters.
 
+          First variation = pass in model instances
    ```js
-     // First build json for the instances you want 'returned' in your query.
-     var usersJson = FactoryGuy.buildList('user', 2);
 
-     // Pass in the parameters you will search on ( in this case 'name' and 'age' ) as an array,
-     // in the second argument.
-     testHelper.handleFindQuery('user', ['name', 'age'], usersJson);
+     // Create model instances
+     var users = FactoryGuy.makeList('user', 2, 'with_hats');
+
+     // Pass in the array of model instances as last argument
+     testHelper.handleFindQuery('user', ['name', 'age'], users);
 
      store.findQuery('user', {name:'Bob', age: 10}}).then(function(userInstances){
-        /// userInstances were created from the usersJson that you passed in
+        /// userInstances will be the same of the users that were passed in
      })
    ```
 
-   The model instances will be created from the json you have passed in.
+        Third variation - pass in nothing for last argument
+   ```js
+   // This simulates a query that returns no results
+   testHelper.handleFindQuery('user', ['age']);
+
+   store.findQuery('user', {age: 10000}}).then(function(userInstances){
+        /// userInstances will be empty
+     })
+   ```
 
    @param {String} modelName  name of the mode like 'user' for User model type
    @param {String} searchParams  the parameters that will be queried
-   @param {Object} json   fixture json used to build the resulting modelType instances
+   @param {Array}  array of DS.Model records to be 'returned' by query
    */
-  handleFindQuery: function (modelName, searchParams, json) {
+  handleFindQuery: function (modelName, searchParams, records) {
+    Ember.assert('The second argument of searchParams must be an array',Em.typeOf(searchParams) == 'array')
+    if (records) {
+      Ember.assert('The third argument ( records ) must be an array - found type:' + Em.typeOf(records), Em.typeOf(records) == 'array')
+    } else {
+      records = []
+    }
+    var json = records.map(function(record) {return record.toJSON({includeId: true})})
     var responseJson = {};
     responseJson[modelName.pluralize()] = json;
     var url = this.buildURL(modelName);

data/src/store.js

@@ -25,7 +25,7 @@
      * Most of the work of making the model from the json fixture is going on here.
      * @param modelType
      * @param fixture
-     * @returns {*}
+     * @returns {DS.Model} instance of DS.Model
      */
     makeModel: function (modelType, fixture) {
       var store = this,
@@ -74,9 +74,11 @@
     setAssociationsForFixtureAdapter: function (modelType, modelName, fixture) {
       var self = this;
       var adapter = this.adapterFor('application');
+
       Ember.get(modelType, 'relationshipsByName').forEach(function (relationship, name) {
+        var hasManyRelation, belongsToRecord;
         if (relationship.kind == 'hasMany') {
-          var hasManyRelation = fixture[relationship.key];
+          hasManyRelation = fixture[relationship.key];
           if (hasManyRelation) {
             $.each(fixture[relationship.key], function (index, object) {
               // used to require that the relationship was set by id,
@@ -84,17 +86,19 @@
               // normalize that back to the id
               var id = object;
               if (Ember.typeOf(object) == 'object') {
+                FactoryGuy.pushFixture(relationship.type, object);
                 id = object.id;
                 hasManyRelation[index] = id;
               }
               var hasManyfixtures = adapter.fixturesForType(relationship.type);
-              var fixture = adapter.findFixtureById(hasManyfixtures, id);
-              fixture[modelName] = fixture.id;
+              var hasManyFixture = adapter.findFixtureById(hasManyfixtures, id);
+              hasManyFixture[modelName] = fixture.id;
+              self.loadModelForFixtureAdapter(relationship.type, hasManyFixture);
             });
           }
         }
         if (relationship.kind == 'belongsTo') {
-          var belongsToRecord = fixture[relationship.key];
+          belongsToRecord = fixture[relationship.key];
           if (belongsToRecord) {
             if (typeof belongsToRecord == 'object') {
               FactoryGuy.pushFixture(relationship.type, belongsToRecord);
@@ -107,10 +111,29 @@
               belongsTofixture[hasManyName] = [];
             }
             belongsTofixture[hasManyName].push(fixture.id);
+            self.loadModelForFixtureAdapter(relationship.type, belongsTofixture);
           }
         }
       });
     },
+
+    loadModelForFixtureAdapter: function(modelType, fixture) {
+      var storeModel = this.getById(modelType, fixture.id),
+          that = this;
+      if (!Ember.isPresent(storeModel) || storeModel.get('isEmpty')) {
+        Ember.run(function () {
+          var dup = Ember.copy(fixture, true);
+          that.push(modelType, fixture);
+          //replace relationships back to ids instead of built ember objects
+          Ember.get(modelType, 'relationshipsByName').forEach(function (relationship, name) {
+            if(fixture[relationship.key]) {
+              fixture[relationship.key] = dup[relationship.key];
+            }
+          });
+        });
+      }
+    },
+
     /**
      Before pushing the fixture to the store, do some preprocessing. Descend into the tree
      of object data, and convert child objects to record instances recursively.
@@ -219,9 +242,32 @@
      @param {Object} payload
      */
     pushPayload: function (type, payload) {
+      var typeName, model;
+
       if (this.usingFixtureAdapter()) {
-        var model = this.modelFor(type);
-        FactoryGuy.pushFixture(model, payload);
+        if (Ember.typeOf(type) === 'string' && Ember.isPresent(payload) && Ember.isPresent(payload.id)){
+          //pushPayload('user', {id:..})
+          model = this.modelFor(type);
+          FactoryGuy.pushFixture(model, payload);
+          this.push(model, Ember.copy(payload, true));
+        } else if(Ember.typeOf(type) === 'object' || Ember.typeOf(payload) === 'object') {
+          //pushPayload({users: {id:..}}) OR pushPayload('user', {users: {id:..}})
+          if(Ember.isBlank(payload)){
+            payload = type;
+          }
+
+          for (var prop in payload) {
+            typeName = Ember.String.camelize(Ember.String.singularize(prop));
+            model = this.modelFor(typeName);
+
+            this.pushMany(model, Ember.makeArray( Ember.copy(payload[prop], true) ));
+            Ember.ArrayPolyfills.forEach.call(Ember.makeArray(payload[prop]), function(hash) {
+              FactoryGuy.pushFixture(model, hash);
+            }, this);
+          }
+        } else {
+          throw new Ember.Error('Assertion Failed: You cannot use `store#pushPayload` with this method signature pushPayload(' + type + ',' + payload + ')');
+        }
       } else {
         this._super(type, payload);
       }

data/tests/factory_guy_test.js

@@ -14,7 +14,7 @@ module('FactoryGuy with DS.RESTAdapter', {
 
 test("can set and get store", function() {
   FactoryGuy.setStore(store);
-  equal(FactoryGuy.getStore(), store)
+  ok(FactoryGuy.getStore() == store)
 });
 
 test("Using sequences in definitions", function() {

data/tests/factory_guy_test_mixin_test.js

@@ -56,14 +56,52 @@ asyncTest("#handleCreate the basic", function() {
 
 /////// handleFindQuery //////////
 
-asyncTest("#handleFindQuery", function() {
-  var users = FactoryGuy.buildList('user', 2);
+test("#handleFindQuery second argument should be an array", function(assert) {
+  assert.throws(function(){testHelper.handleFindQuery('user', 'name', {})},"second argument not correct type");
+});
+
+test("#handleFindQuery json payload argument should be an array", function(assert) {
+  assert.throws(function(){testHelper.handleFindQuery('user', ['name'], {})},"payload argument is not an array");
+});
+
+asyncTest("#handleFindQuery passing in nothing as last argument returns no results", function() {
+  testHelper.handleFindQuery('user', ['name']);
+  store.findQuery('user', {name: 'Bob'}).then(function (users) {
+    equal(users.get('length'),0)
+    start()
+  });
+})
+
+
+asyncTest("#handleFindQuery passing in existing instances returns those and does not create new ones", function() {
+  var users = FactoryGuy.makeList('user', 2, 'with_hats');
   testHelper.handleFindQuery('user', ['name'], users);
 
+  equal(store.all('user').get('content.length'), 2, 'start out with 2 instances')
+
   store.findQuery('user', {name: 'Bob'}).then(function (users) {
     equal(users.get('length'), 2)
     equal(users.get('firstObject.name'), 'User1')
+    equal(users.get('firstObject.hats.length'), 2)
     equal(users.get('lastObject.name'), 'User2')
+    equal(store.all('user').get('content.length'), 2, 'no new instances created')
+    start();
+  })
+});
+
+asyncTest("#handleFindQuery passing in existing instances with hasMany and belongsTo", function() {
+  var users = FactoryGuy.makeList('company', 2, 'with_projects', 'with_profile');
+  testHelper.handleFindQuery('company', ['name'], users);
+
+  equal(store.all('company').get('content.length'), 2, 'start out with 2 instances')
+
+  store.findQuery('company', {name: 'Dude'}).then(function (companies) {
+    equal(companies.get('length'), 2)
+    ok(companies.get('firstObject.profile') instanceof Profile)
+    equal(companies.get('firstObject.projects.length'), 2)
+    ok(companies.get('lastObject.profile') instanceof Profile)
+    equal(companies.get('lastObject.projects.length'), 2)
+    equal(store.all('company').get('content.length'), 2, 'no new instances created')
     start();
   })
 });
@@ -74,7 +112,7 @@ asyncTest("#handleFindQuery", function() {
 asyncTest("#handleFindMany the basic", function () {
   testHelper.handleFindMany('profile', 2);
 
-  store.find('profile').then(function (profiles) {
+  store.findAll('profile').then(function (profiles) {
     ok(profiles.get('length') == 2);
     start();
   });
@@ -83,7 +121,7 @@ asyncTest("#handleFindMany the basic", function () {
 asyncTest("#handleFindMany with fixture options", function () {
   testHelper.handleFindMany('profile', 2, {description: 'dude'});
 
-  store.find('profile').then(function (profiles) {
+  store.findAll('profile').then(function (profiles) {
     ok(profiles.get('length') == 2);
     ok(profiles.get('firstObject.description') == 'dude');
     start();
@@ -93,7 +131,7 @@ asyncTest("#handleFindMany with fixture options", function () {
 asyncTest("#handleFindMany with traits", function () {
   testHelper.handleFindMany('profile', 2, 'goofy_description');
 
-  store.find('profile').then(function (profiles) {
+  store.findAll('profile').then(function (profiles) {
     ok(profiles.get('length') == 2);
     ok(profiles.get('firstObject.description') == 'goofy');
     start();
@@ -103,7 +141,7 @@ asyncTest("#handleFindMany with traits", function () {
 asyncTest("#handleFindMany with traits and extra options", function () {
   testHelper.handleFindMany('profile', 2, 'goofy_description', {description: 'dude'});
 
-  store.find('profile').then(function (profiles) {
+  store.findAll('profile').then(function (profiles) {
     ok(profiles.get('length') == 2);
     ok(profiles.get('firstObject.description') == 'dude');
     start();

data/tests/fixture_adapter_factory_test.js

@@ -25,7 +25,8 @@ test("#pushFixture adds fixture to Fixture array on model", function () {
 
 
 asyncTest("can change fixture attributes after creation", function () {
-  var user = store.makeFixture('user');
+  var user = FactoryGuy.make('user');
+  notEqual(user.name, 'new name');
   user.name = "new name";
 
   store.find('user', 1).then(function (user) {
@@ -36,21 +37,27 @@ asyncTest("can change fixture attributes after creation", function () {
 
 
 test("#resetModels clears the store of models, clears the FIXTURES arrays for each model and resets the model definition", function () {
-  var project = store.makeFixture('project');
-  var user = store.makeFixture('user', {projects: [project]});
+  var project = FactoryGuy.make('project');
+  var user = FactoryGuy.make('user', { projects: [project] });
 
   for (model in FactoryGuy.modelDefinitions) {
     var definition = FactoryGuy.modelDefinitions[model];
     sinon.spy(definition, 'reset');
   }
 
+  equal(User.FIXTURES.length, 1);
+  equal(Project.FIXTURES.length, 1);
+
+  equal(store.all('user').get('length'), 1);
+  equal(store.all('project').get('length'), 1);
+
   FactoryGuy.resetModels(store);
 
   equal(User.FIXTURES.length, 0);
   equal(Project.FIXTURES.length, 0);
 
-  equal(store.all('user').get('content.length'), 0)
-  equal(store.all('project').get('content.length'), 0)
+  equal(store.all('user').get('length'), 0);
+  equal(store.all('project').get('length'), 0);
 
   for (model in FactoryGuy.modelDefinitions) {
     var definition = FactoryGuy.modelDefinitions[model];
@@ -59,6 +66,16 @@ test("#resetModels clears the store of models, clears the FIXTURES arrays for ea
   }
 });
 
+test("Confirm traits build relationships", function () {
+  var project = FactoryGuy.make('project', 'big'),
+      projectWithUser = FactoryGuy.make('project_with_admin');
+
+  equal(Project.FIXTURES.length, 2);
+  equal(User.FIXTURES.length, 1);
+
+  equal(project.title, 'Big Project', 'Big trait changed name to "Big Project"');
+  equal(projectWithUser.user, 1, 'User created');
+});
 
 module('DS.Store with DS.FixtureAdapter', {
   setup: function () {
@@ -73,71 +90,106 @@ module('DS.Store with DS.FixtureAdapter', {
 });
 
 
-test("#makeFixture builds and pushes fixture into the models FIXTURE array", function () {
-  var json = store.makeFixture('user');
+test("#make builds and pushes fixture into the models FIXTURE array", function () {
+  var json = FactoryGuy.make('user');
   equal(User.FIXTURES.length, 1);
   equal(User.FIXTURES[0], json);
 });
 
-
-asyncTest("#makeFixture sets belongsTo on hasMany associations", function () {
-  var p1 = store.makeFixture('project');
+asyncTest("#make sets belongsTo on hasMany associations", function () {
+  var p1 = FactoryGuy.make('project');
   // second project not added on purpose to make sure only one is
   // assigned in hasMany
-  store.makeFixture('project');
-  var user = store.makeFixture('user', {projects: [p1]})
+  FactoryGuy.make('project');
+  var user = FactoryGuy.make('user', {projects: [p1]})
 
   store.find('user', 1).then(function (user) {
-//    var projects = user.get('projects');
-    console.log(user+'', user.toJSON())
-//    console.log(user+'', projects)
-//    equal(projects.length, 1, "adds hasMany records");
+    var projects = user.get('projects');
+    equal(projects.get('length'), 1, "adds hasMany records");
     start();
-  })
-})
-
+  });
+});
 
-asyncTest("#makeFixture adds record to hasMany association array for which it belongsTo", function () {
-  var userJson = store.makeFixture('user');
-  var projectJson = store.makeFixture('project', {user: userJson});
+asyncTest("#make adds record to hasMany association array for which it belongsTo", function () {
+  var userJson = FactoryGuy.make('user');
+  var projectJson = FactoryGuy.make('project', { user: userJson });
 
   store.find('user', userJson.id).then(function (user) {
     var projects = user.get('projects');
-    equal(projects.length, 1, "adds hasMany records");
-    equal(projects.get('firstObject.user'), user, "sets belongsTo record");
+    equal(projects.get('length'), 1, "adds hasMany records");
+    ok(projects.get('firstObject.user') == user, "sets belongsTo record");
     start();
-  })
-})
+  });
+});
 
-asyncTest("#makeFixture handles default belongsTo associations in fixture", function () {
-  var projectWithUser = store.makeFixture('project_with_user');
+asyncTest("#make handles traits declaring belongsTo associations in fixture", function () {
+  var projectWithUser = FactoryGuy.make('project_with_user');
+  equal(Project.FIXTURES.length, 1);
   equal(User.FIXTURES.length, 1);
 
   store.find('user', 1).then(function (user) {
-    
     var projects = user.get('projects');
-    equal(projects.length, 1, "adds hasMany records");
+
+    equal(projects.get('length'), 1, "adds hasMany records");
+    equal(projects.get('firstObject.id'), projectWithUser.id);
     equal(projects.get('firstObject.user.id'), 1, "sets belongsTo record");
     start();
-  })
-  // TODO.. have to make belongsTo async for fixture adapter
-  // to get this to work
-//  store.find('project', projectWithUser.id).then( function(project) {
-//    console.log('a',project+'', project.id)
-//    console.log('b',project.get('user')+'', project.get('user').toJSON())
-//    project.get('user').then( function(user) {
-//      console.log('c',user.toJSON())
-//    })
-//    start();
-//  })
-})
+  });
+});
+
+asyncTest("#make handles primary belongsTo association in fixture", function () {
+  var projectWithUser = FactoryGuy.make('project_with_user');
+  equal(Project.FIXTURES.length, 1);
+  equal(User.FIXTURES.length, 1);
 
+  store.find('project', projectWithUser.id).then( function(project) {
+    var user = project.get('user');
+    ok(user);
+    equal(user.get('id'), projectWithUser.user);
+    equal(user.get('projects.firstObject.id'), projectWithUser.id)
+
+    start();
+  });
+});
+
+asyncTest('#make handles hasMany association in fixture', function () {
+  var userWithProjects = FactoryGuy.make('user', 'with_projects');
+  equal(Project.FIXTURES.length, 2);
+  equal(User.FIXTURES.length, 1);
+
+  store.find('user', userWithProjects.id).then(function(user) {
+    var projects = user.get('projects');
+    equal(user.get('id'), userWithProjects.id);
+    equal(projects.get('length'), 2);
+    deepEqual(
+      projects.mapBy('id').sort(),
+      userWithProjects.projects.map(function(project){ return project.toString(); }).sort()
+    );
+
+    start();
+  });
+});
+
+// TODO:: does not handle deeply embedded relationships yet..
+// asyncTest('#make handles belongsTo deeply associated in fixture', function () {
+//   var propertyOwnersProjects = FactoryGuy.make('property', 'with_owners_with_projects');
+//   equal(Property.FIXTURES.length, 1);
+//   equal(User.FIXTURES.length, 2);
+//   equal(Project.FIXTURES.length, 4);
+//
+//   store.find('property', propertyOwnersProjects.id).then(function(property) {
+//     var users = property.get('owners');
+//     users.each(function(user){
+//       user.get('projects');
+//     });
+//     start();
+//   });
+// });
 
 asyncTest("#createRecord adds belongsTo association to records it hasMany of", function () {
-  var user = store.makeFixture('user');
+  var user = FactoryGuy.make('user');
 
   store.find('user', user.id).then(function (user) {
-
     var projectJson = {title: 'project', user: user};
 
     store.createRecord('project', projectJson).save()
@@ -145,18 +197,18 @@ asyncTest("#createRecord adds belongsTo association to records it hasMany of", f
         return Ember.RSVP.all([project.get('user'), user.get('projects')]);
       }).then(function (promises) {
         var projectUser = promises[0], projects = promises[1];
-        equal(projectUser, user);
-        equal(projects.length, 1);
+
+        ok(projectUser == user);
+        equal(projects.get('length'), 1);
         start();
       });
-  })
-})
+  });
+});
 
 asyncTest("#createRecord can work for one-to-none associations", function () {
-  var user = store.makeFixture('user');
+  var user = FactoryGuy.make('user');
 
   store.find('user', user.id).then(function (user) {
-
     var smallCompanyJson = {name: 'small company', owner: user};
 
     store.createRecord('small_company', smallCompanyJson).save()
@@ -166,20 +218,20 @@ asyncTest("#createRecord can work for one-to-none associations", function () {
         equal(owner.get('id'), user.get('id'));
         start();
       });
-  })
-})
+  });
+});
 
 asyncTest("#createRecord adds hasMany association to records it hasMany of ", function () {
-  var usersJson = store.makeList('user', 3);
-  var userPromises = usersJson.map(function(json) { return store.find('user', json.id) })
-  Em.RSVP.all(userPromises).then(function (users) {
+  var usersJson = FactoryGuy.makeList('user', 3);
+  var userPromises = usersJson.map(function(json) { return store.find('user', json.id) });
 
-    var propertyJson = {name: 'beach front property'};
+  Ember.RSVP.all(userPromises).then(function (users) {
+    var propertyJson = {name: 'beach front property'},
+        property = store.createRecord('property', propertyJson),
+        owners = property.get('owners');
 
-    var property = store.createRecord('property', propertyJson);
-    var owners = property.get('owners')
     owners.addObjects(users);
     equal(users.get('length'), usersJson.length);
     start();
-  })
-})
+  });
+});