ember-data-factory-guy 0.8.7 → 0.9.0

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

@@ -90,9 +90,19 @@ var ModelDefinition = function (model, config) {
         // function might be a sequence of a named association
         fixture[attribute] = fixture[attribute].call(this, fixture);
       } else if (Ember.typeOf(fixture[attribute]) == 'object') {
-        // if it's an object it's for a model association, so build the json
+        // If it's an object and it's a model association attribute, build the json
         // for the association and replace the attribute with that json
-        fixture[attribute] = FactoryGuy.build(attribute, fixture[attribute]);
+        if (FactoryGuy.getStore()) {
+          if (FactoryGuy.isAttributeRelationship(this.model, attribute)) {
+            fixture[attribute] = FactoryGuy.build(attribute, fixture[attribute]);
+          }
+        } else {
+          // For legacy reasons, if the store is not set in FactoryGuy, keep
+          // this code the way it is ( though it will cause failures when the object is actually
+          // a custom attribute and not a relationship ), while users start setting the store
+          // in FactoryGuy, or using testHelper.make instead of store.makeFixture
+          fixture[attribute] = FactoryGuy.build(attribute, fixture[attribute]);
+        }
       }
     }
     // set the id, unless it was already set in opts
@@ -213,6 +223,44 @@ var FactoryGuy = {
       this.modelDefinitions[model] = new ModelDefinition(model, config);
     }
   },
+  /**
+   Setting the store so FactoryGuy can do some model introspection.
+   */
+   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;
+  },
+  /**
+   Checks a model's attribute to determine if it's a relationship.
+
+   @param {String} typeName  model type name like 'user' for User model class
+   @param {String} attribute  attribute you want to check
+   @returns {Boolean} true if the attribute is a relationship, false if not
+   */
+  isAttributeRelationship: function(typeName, attribute) {
+    if (!this.store) {
+      console.log("FactoryGuy does not have the application's store. Use FactoryGuy.setStore(store) before making any fixtures")
+      // The legacy value was true.
+      return true;
+    }
+    var model = this.store.modelFor(typeName);
+    return !!model.typeForRelationship(attribute);
+  },
+  /**
+   Make new fixture and save to store. Proxy to store#makeFixture method
+
+   @param {String} name  fixture name
+   @param {String} trait  optional trait names ( one or more )
+   @param {Object} opts  optional fixture options that will override default fixture values
+   @returns {Object|DS.Model} json or record depending on the adapter type
+   */
+  make: function() {
+    Ember.assert("FactoryGuy does not have the application's store. Use FactoryGuy.setStore(store) before making any fixtures", this.store);
+    return this.store.makeFixture.apply(this.store,arguments);
+  },
   /**
    Used in model definitions to declare use of a sequence. For example:
 
@@ -736,6 +784,7 @@ var FactoryGuyTestMixin = Em.Mixin.create({
   // Pass in the app root, which typically is App.
   setup: function (app) {
     this.set('container', app.__container__);
+    FactoryGuy.setStore(this.getStore());
     return this;
   },
   useFixtureAdapter: function (app) {
@@ -763,8 +812,7 @@ var FactoryGuyTestMixin = Em.Mixin.create({
     return this.getStore().find(type, id);
   },
   /**
-   Proxy to store's makeFixture method
-
+   Make new fixture and save to store. Proxy to store#makeFixture method
    */
   make: function () {
     var store = this.getStore();
@@ -773,12 +821,6 @@ var FactoryGuyTestMixin = Em.Mixin.create({
   getStore: function () {
     return this.get('container').lookup('store:main');
   },
-  pushPayload: function (type, hash) {
-    return this.getStore().pushPayload(type, hash);
-  },
-  pushRecord: function (type, hash) {
-    return this.getStore().push(type, hash);
-  },
   /**
    Using mockjax to stub an http request.
 
@@ -855,7 +897,10 @@ var FactoryGuyTestMixin = Em.Mixin.create({
     so you don't need to include them in the returns hash as well.
 
      2) If you don't use match options for exact match, there will be no id returned to the model.
-
+        The reason being, that this method purposely returns an empty hash response with a 'don't match'
+        style handleCreate, because if the responseJson returns a non empty data hash ( with even only
+        the id), this essentially empty hash of attributes will override ( and nullify ) all the attributes
+        that set when you created the record.
      3) If you match on a belongsTo association, you don't have to include that in the
     returns hash.
 
@@ -908,8 +953,25 @@ var FactoryGuyTestMixin = Em.Mixin.create({
    @param {Boolean} succeed  optional flag to indicate if the request
       should succeed ( default is true )
    */
-  handleUpdate: function (type, id, succeed) {
-    succeed = succeed === undefined ? true : succeed;
+  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

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"){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)}},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){console.log("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)},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(){var store=this;var fixture=FactoryGuy.build.apply(FactoryGuy,arguments);var name=arguments[0];var modelName=FactoryGuy.lookupModelForFixtureName(name);var modelType=store.modelFor(modelName);if(this.usingFixtureAdapter()){this.setAssociationsForFixtureAdapter(modelType,modelName,fixture);return FactoryGuy.pushFixture(modelType,fixture)}else{return store.makeModel(modelType,fixture)}},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},makeList:function(){var arr=[];var number=arguments[1];for(var i=0;i<number;i++){arr.push(this.makeFixture.apply(this,arguments))}return arr},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__);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(){var store=this.getStore();return store.makeFixture.apply(store,arguments)},getStore:function(){return this.get("container").lookup("store:main")},pushPayload:function(type,hash){return this.getStore().pushPayload(type,hash)},pushRecord:function(type,hash){return this.getStore().push(type,hash)},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.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 store=this.getStore();store.makeList.apply(store,arguments);var name=arguments[0];var modelName=FactoryGuy.lookupModelForFixtureName(name);var responseJson={};responseJson[modelName]=[];var url=this.buildURL(modelName);this.stubEndpointForHttpRequest(url,responseJson,{type:"GET"})},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){if(options){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(type,id,succeed){succeed=succeed===undefined?true:succeed;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){console.log("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)},make:function(){Ember.assert("FactoryGuy does not have the application's store. Use FactoryGuy.setStore(store) before making any fixtures",this.store);return this.store.makeFixture.apply(this.store,arguments)},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){console.log("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)},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(){var store=this;var fixture=FactoryGuy.build.apply(FactoryGuy,arguments);var name=arguments[0];var modelName=FactoryGuy.lookupModelForFixtureName(name);var modelType=store.modelFor(modelName);if(this.usingFixtureAdapter()){this.setAssociationsForFixtureAdapter(modelType,modelName,fixture);return FactoryGuy.pushFixture(modelType,fixture)}else{return store.makeModel(modelType,fixture)}},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},makeList:function(){var arr=[];var number=arguments[1];for(var i=0;i<number;i++){arr.push(this.makeFixture.apply(this,arguments))}return arr},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(){var store=this.getStore();return store.makeFixture.apply(store,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.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 store=this.getStore();store.makeList.apply(store,arguments);var name=arguments[0];var modelName=FactoryGuy.lookupModelForFixtureName(name);var responseJson={};responseJson[modelName]=[];var url=this.buildURL(modelName);this.stubEndpointForHttpRequest(url,responseJson,{type:"GET"})},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){if(options){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,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = "ember-data-factory-guy"
-  s.version     = "0.8.7"
+  s.version     = "0.9.0"
   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.8.7",
+  "version": "0.9.0",
   "authors": [
     "Daniel Sudol <dansudol@yahoo.com>",
     "Opak Alex <opak.alexandr@gmail.com>"

data/src/factory_guy.js

@@ -45,6 +45,44 @@ var FactoryGuy = {
       this.modelDefinitions[model] = new ModelDefinition(model, config);
     }
   },
+  /**
+   Setting the store so FactoryGuy can do some model introspection.
+   */
+   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;
+  },
+  /**
+   Checks a model's attribute to determine if it's a relationship.
+
+   @param {String} typeName  model type name like 'user' for User model class
+   @param {String} attribute  attribute you want to check
+   @returns {Boolean} true if the attribute is a relationship, false if not
+   */
+  isAttributeRelationship: function(typeName, attribute) {
+    if (!this.store) {
+      console.log("FactoryGuy does not have the application's store. Use FactoryGuy.setStore(store) before making any fixtures")
+      // The legacy value was true.
+      return true;
+    }
+    var model = this.store.modelFor(typeName);
+    return !!model.typeForRelationship(attribute);
+  },
+  /**
+   Make new fixture and save to store. Proxy to store#makeFixture method
+
+   @param {String} name  fixture name
+   @param {String} trait  optional trait names ( one or more )
+   @param {Object} opts  optional fixture options that will override default fixture values
+   @returns {Object|DS.Model} json or record depending on the adapter type
+   */
+  make: function() {
+    Ember.assert("FactoryGuy does not have the application's store. Use FactoryGuy.setStore(store) before making any fixtures", this.store);
+    return this.store.makeFixture.apply(this.store,arguments);
+  },
   /**
    Used in model definitions to declare use of a sequence. For example:
 

data/src/factory_guy_test_mixin.js

@@ -2,6 +2,7 @@ var FactoryGuyTestMixin = Em.Mixin.create({
   // Pass in the app root, which typically is App.
   setup: function (app) {
     this.set('container', app.__container__);
+    FactoryGuy.setStore(this.getStore());
     return this;
   },
   useFixtureAdapter: function (app) {
@@ -29,8 +30,7 @@ var FactoryGuyTestMixin = Em.Mixin.create({
     return this.getStore().find(type, id);
   },
   /**
-   Proxy to store's makeFixture method
-
+   Make new fixture and save to store. Proxy to store#makeFixture method
    */
   make: function () {
     var store = this.getStore();
@@ -39,12 +39,6 @@ var FactoryGuyTestMixin = Em.Mixin.create({
   getStore: function () {
     return this.get('container').lookup('store:main');
   },
-  pushPayload: function (type, hash) {
-    return this.getStore().pushPayload(type, hash);
-  },
-  pushRecord: function (type, hash) {
-    return this.getStore().push(type, hash);
-  },
   /**
    Using mockjax to stub an http request.
 
@@ -121,7 +115,10 @@ var FactoryGuyTestMixin = Em.Mixin.create({
     so you don't need to include them in the returns hash as well.
 
      2) If you don't use match options for exact match, there will be no id returned to the model.
-
+        The reason being, that this method purposely returns an empty hash response with a 'don't match'
+        style handleCreate, because if the responseJson returns a non empty data hash ( with even only
+        the id), this essentially empty hash of attributes will override ( and nullify ) all the attributes
+        that set when you created the record.
      3) If you match on a belongsTo association, you don't have to include that in the
     returns hash.
 
@@ -174,8 +171,25 @@ var FactoryGuyTestMixin = Em.Mixin.create({
    @param {Boolean} succeed  optional flag to indicate if the request
       should succeed ( default is true )
    */
-  handleUpdate: function (type, id, succeed) {
-    succeed = succeed === undefined ? true : succeed;
+  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

data/src/model_definition.js

@@ -69,9 +69,19 @@ var ModelDefinition = function (model, config) {
         // function might be a sequence of a named association
         fixture[attribute] = fixture[attribute].call(this, fixture);
       } else if (Ember.typeOf(fixture[attribute]) == 'object') {
-        // if it's an object it's for a model association, so build the json
+        // If it's an object and it's a model association attribute, build the json
         // for the association and replace the attribute with that json
-        fixture[attribute] = FactoryGuy.build(attribute, fixture[attribute]);
+        if (FactoryGuy.getStore()) {
+          if (FactoryGuy.isAttributeRelationship(this.model, attribute)) {
+            fixture[attribute] = FactoryGuy.build(attribute, fixture[attribute]);
+          }
+        } else {
+          // For legacy reasons, if the store is not set in FactoryGuy, keep
+          // this code the way it is ( though it will cause failures when the object is actually
+          // a custom attribute and not a relationship ), while users start setting the store
+          // in FactoryGuy, or using testHelper.make instead of store.makeFixture
+          fixture[attribute] = FactoryGuy.build(attribute, fixture[attribute]);
+        }
       }
     }
     // set the id, unless it was already set in opts

data/tests/active_model_adapter_factory_test.js

@@ -1,9 +1,11 @@
-var testHelper, store;
+var testHelper, store, make;
+
 
 module('FactoryGuy with ActiveModelAdapter', {
   setup: function() {
     testHelper = TestHelper.setup(DS.ActiveModelAdapter);
     store = testHelper.getStore();
+    make = function() {return testHelper.make.apply(testHelper,arguments)}
   },
   teardown: function() {
     testHelper.teardown();
@@ -12,8 +14,8 @@ module('FactoryGuy with ActiveModelAdapter', {
 
 
 test("#resetModels clears the store of models, and resets the model definition", function() {
-  var project = store.makeFixture('project');
-  var user = store.makeFixture('user', {projects: [project]});
+  var project = make('project');
+  var user = make('user', {projects: [project]});
 
   for (model in FactoryGuy.modelDefinitions) {
     var definition = FactoryGuy.modelDefinitions[model];
@@ -37,6 +39,7 @@ module('DS.Store#makeFixture with ActiveModelAdapter', {
   setup: function() {
     testHelper = TestHelper.setup(DS.ActiveModelAdapter);
     store = testHelper.getStore();
+    make = function() {return testHelper.make.apply(testHelper,arguments)}
   },
   teardown: function() {
     Em.run(function() { testHelper.teardown(); });
@@ -45,9 +48,9 @@ module('DS.Store#makeFixture with ActiveModelAdapter', {
 
 
 asyncTest("creates records in the store", function() {
-  var user = store.makeFixture('user');
-  ok(user instanceof User);
+  var user = make('user');
 
+  ok(user instanceof User);
   store.find('user', user.id).then(function(store_user) {
     ok(store_user == user);
     start()
@@ -55,38 +58,44 @@ asyncTest("creates records in the store", function() {
 });
 
 
+test("handles custom attribute type attributes", function() {
+  var info = {first:1}
+  var user = make('user', {info: info});
+  ok(user.get('info') == info)
+});
+
 test("handles camelCase attributes", function() {
-  var profile = store.makeFixture('profile', {camelCaseDescription: 'description'});
+  var profile = make('profile', {camelCaseDescription: 'description'});
   ok(profile.get('camelCaseDescription') == 'description')
 });
 
 test("makeFixture with fixture options", function() {
-  var profile = store.makeFixture('profile',  {description: 'dude'});
+  var profile = make('profile',  {description: 'dude'});
   ok(profile.get('description') == 'dude');
 });
 
 test("makeFixture with attributes in traits", function() {
-  var profile = store.makeFixture('profile', 'goofy_description');
+  var profile = make('profile', 'goofy_description');
   ok(profile.get('description') == 'goofy');
 });
 
 test("makeFixture with attributes in traits and fixture options ", function() {
-  var profile = store.makeFixture('profile', 'goofy_description', {description: 'dude'});
+  var profile = make('profile', 'goofy_description', {description: 'dude'});
   ok(profile.get('description') == 'dude');
 });
 
 
 test("when hasMany associations assigned, belongTo parent is assigned", function() {
-  var project = store.makeFixture('project');
-  var user = store.makeFixture('user', {projects: [project]})
+  var project = make('project');
+  var user = make('user', {projects: [project]})
 
   ok(project.get('user') == user);
 });
 
 
 asyncTest("when hasMany ( asnyc ) associations assigned, belongTo parent is assigned", function() {
-  var user = store.makeFixture('user');
-  var company = store.makeFixture('company', {users: [user]});
+  var user = make('user');
+  var company = make('company', {users: [user]});
 
   user.get('company').then(function(c){
     ok(c == company);
@@ -96,9 +105,9 @@ asyncTest("when hasMany ( asnyc ) associations assigned, belongTo parent is assi
 
 
 test("when hasMany ( polymorphic ) associations are assigned, belongTo parent is assigned", function() {
-  var bh = store.makeFixture('big_hat');
-  var sh = store.makeFixture('small_hat');
-  var user = store.makeFixture('user', {hats: [bh, sh]})
+  var bh = make('big_hat');
+  var sh = make('small_hat');
+  var user = make('user', {hats: [bh, sh]})
 
   equal(user.get('hats.length'), 2);
   ok(user.get('hats.firstObject') instanceof BigHat)
@@ -110,40 +119,40 @@ test("when hasMany ( polymorphic ) associations are assigned, belongTo parent is
 
 
 test("when hasMany ( self referential ) associations are assigned, belongsTo parent is assigned", function() {
-  var big_group = store.makeFixture('big_group');
-  var group = store.makeFixture('group', {versions: [big_group]});
+  var big_group = make('big_group');
+  var group = make('group', {versions: [big_group]});
   ok(big_group.get('group') == group)
 });
 
 
 test("when hasMany associations are assigned, belongsTo parent is assigned using inverse", function() {
-  var project = store.makeFixture('project');
-  var project2 = store.makeFixture('project', {children: [project]});
+  var project = make('project');
+  var project2 = make('project', {children: [project]});
 
   ok(project.get('parent') == project2);
 });
 
 
 test("when hasMany associations are assigned, belongsTo parent is assigned using actual belongsTo name", function() {
-  var silk = store.makeFixture('silk');
-  var big_hat = store.makeFixture('big_hat', {materials: [silk]});
+  var silk = make('silk');
+  var big_hat = make('big_hat', {materials: [silk]});
 
   ok(silk.get('hat') == big_hat)
 });
 
 
 test("when hasMany associations are assigned, belongsTo ( polymorphic ) parent is assigned", function() {
-  var fluff = store.makeFixture('fluffy_material');
-  var big_hat = store.makeFixture('big_hat', {fluffy_materials: [fluff]});
+  var fluff = make('fluffy_material');
+  var big_hat = make('big_hat', {fluffy_materials: [fluff]});
 
   ok(fluff.get('hat') == big_hat)
 });
 
 
 test("when belongTo parent is assigned, parent adds to hasMany records", function() {
-  var user = store.makeFixture('user');
-  var project1 = store.makeFixture('project', {user: user});
-  var project2 = store.makeFixture('project', {user: user});
+  var user = make('user');
+  var project1 = make('project', {user: user});
+  var project2 = make('project', {user: user});
 
   equal(user.get('projects.length'), 2);
   ok(user.get('projects.firstObject') == project1);
@@ -152,9 +161,9 @@ test("when belongTo parent is assigned, parent adds to hasMany records", functio
 
 
 test("when belongTo parent is assigned, parent adds to polymorphic hasMany records", function() {
-  var user = store.makeFixture('user');
-  store.makeFixture('big_hat', {user: user});
-  store.makeFixture('small_hat', {user: user});
+  var user = make('user');
+  make('big_hat', {user: user});
+  make('small_hat', {user: user});
 
   equal(user.get('hats.length'), 2);
   ok(user.get('hats.firstObject') instanceof BigHat)
@@ -163,9 +172,9 @@ test("when belongTo parent is assigned, parent adds to polymorphic hasMany recor
 
 
 asyncTest("when async hasMany relationship is assigned, model relationship is synced on both sides", function() {
-  var property = store.makeFixture('property');
-  var user1 = store.makeFixture('user', {properties: [property]});
-  var user2 = store.makeFixture('user', {properties: [property]});
+  var property = make('property');
+  var user1 = make('user', {properties: [property]});
+  var user2 = make('user', {properties: [property]});
 
   equal(property.get('owners.length'), 2);
   ok(property.get('owners.firstObject') == user1);
@@ -175,9 +184,9 @@ asyncTest("when async hasMany relationship is assigned, model relationship is sy
 
 
 asyncTest("when async belongsTo parent is assigned, parent adds to hasMany records", function() {
-  var company = store.makeFixture('company');
-  var user1 = store.makeFixture('user', {company: company});
-  var user2 = store.makeFixture('user', {company: company});
+  var company = make('company');
+  var user1 = make('user', {company: company});
+  var user2 = make('user', {company: company});
 
   equal(company.get('users.length'), 2);
   ok(company.get('users.firstObject') == user1);
@@ -187,8 +196,8 @@ asyncTest("when async belongsTo parent is assigned, parent adds to hasMany recor
 
 
 test("when belongTo parent is assigned, parent adds to hasMany record using inverse", function() {
-  var project = store.makeFixture('project');
-  var project2 = store.makeFixture('project', {parent: project});
+  var project = make('project');
+  var project2 = make('project', {parent: project});
 
   equal(project.get('children.length'), 1);
   ok(project.get('children.firstObject') == project2);
@@ -196,43 +205,43 @@ test("when belongTo parent is assigned, parent adds to hasMany record using inve
 
 
 test("when belongTo parent is assigned, parent adds to hasMany record using actual hasMany name", function() {
-  var bh = store.makeFixture('big_hat');
-  var silk = store.makeFixture('silk', {hat: bh});
+  var bh = make('big_hat');
+  var silk = make('silk', {hat: bh});
 
   ok(bh.get('materials.firstObject') == silk)
 });
 
 
 test("when belongTo parent is assigned, parent adds to belongsTo record", function() {
-  var company = store.makeFixture('company');
-  var profile = store.makeFixture('profile', {company: company});
+  var company = make('company');
+  var profile = make('profile', {company: company});
   ok(company.get('profile') == profile);
 
   // but guard against a situation where a model can belong to itself
   // and do not want to set the belongsTo on this case.
-  var hat1 = store.makeFixture('big_hat')
-  var hat2 = store.makeFixture('big_hat', {hat: hat1})
+  var hat1 = make('big_hat')
+  var hat2 = make('big_hat', {hat: hat1})
   ok(hat1.get('hat') == null);
   ok(hat2.get('hat') == hat1);
 });
 
 
 test("belongsTo associations defined as attributes in fixture", function() {
-  var project = store.makeFixture('project_with_user');
+  var project = make('project_with_user');
   equal(project.get('user') instanceof User, true)
   ok(project.get('user.name') == 'User1');
 
-  var project = store.makeFixture('project_with_dude');
+  var project = make('project_with_dude');
   ok(project.get('user.name') == 'Dude');
 
-  var project = store.makeFixture('project_with_admin');
+  var project = make('project_with_admin');
   ok(project.get('user.name') == 'Admin');
 });
 
 
 
 test("hasMany associations defined as attributes in fixture", function() {
-  var user = store.makeFixture('user_with_projects');
+  var user = make('user_with_projects');
   equal(user.get('projects.length'), 2)
   ok(user.get('projects.firstObject.user') == user)
   ok(user.get('projects.lastObject.user') == user)
@@ -240,7 +249,7 @@ test("hasMany associations defined as attributes in fixture", function() {
 
 
 test("hasMany associations defined with traits", function() {
-  var user = store.makeFixture('user', 'with_projects');
+  var user = make('user', 'with_projects');
   equal(user.get('projects.length'), 2)
   ok(user.get('projects.firstObject.user') == user)
   ok(user.get('projects.lastObject.user') == user)
@@ -249,17 +258,17 @@ test("hasMany associations defined with traits", function() {
 
 
 test("belongsTo associations defined with traits", function() {
-  var hat1 = store.makeFixture('hat', 'with_user');
+  var hat1 = make('hat', 'with_user');
   equal(hat1.get('user') instanceof User, true)
 
-  var hat2 = store.makeFixture('hat', 'with_user', 'with_outfit');
+  var hat2 = make('hat', 'with_user', 'with_outfit');
   equal(hat2.get('user') instanceof User, true)
   equal(hat2.get('outfit') instanceof Outfit, true)
 })
 
 
 test("with (nested json fixture) belongsTo has a hasMany association which has a belongsTo", function() {
-  var project = store.makeFixture('project', 'with_user_having_hats_belonging_to_outfit');
+  var project = make('project', 'with_user_having_hats_belonging_to_outfit');
   var user = project.get('user');
   var hats = user.get('hats');
   var firstHat = hats.get('firstObject');