ember-data-factory-guy 0.7.3 → 0.7.5

data/tests/support/factories/user_factory.js

@@ -1,7 +1,10 @@
 FactoryGuy.define('user', {
+  sequences: {
+    name: function(num) {return 'User' + num}
+  },
   // default values for 'user' attributes
   default: {
-    name: 'User1'
+    name: FactoryGuy.generate('name')
   },
   // named 'user' type with custom attributes
   admin: {
@@ -16,36 +19,47 @@ FactoryGuy.define('user', {
     },
     with_hats: {
       hats: FactoryGuy.hasMany('big_hat', 2)
+    },
+    with_hats_belonging_to_user: {
+      hats: FactoryGuy.hasMany('big_hat', 2, 'belonging_to_user')
+    },
+    with_hats_belonging_to_outfit: {
+      hats: FactoryGuy.hasMany('big_hat', 2, 'belonging_to_outfit')
     }
   }
 });
 
+Progress = DS.Model.extend({});
+Unit = DS.Model.extend({
+  lesson: DS.belongsTo('lesson')
+})
+
+Lesson = DS.Model.extend({
+  steps: DS.hasMany('step'),
+  progress: DS.belongsTo('progress')
+})
 
-//Unit = DS.Model.extend({
-//  lesson: DS.belongsTo('lesson')
-//})
-//
-//Lesson = DS.Model.extend({
-//  steps: DS.hasMany('step')
-//})
-//
-//Step = DS.Model.extend({
-//  lesson: DS.belongsTo ('lesson')
-//})
-//
-//
-//FactoryGuy.define('unit', {
-//  default: {
-//    lesson: FactoryGuy.belongsTo('lesson')
-//  }
-//})
-//
-//FactoryGuy.define('lesson', {
-//  default: {
-//    steps: FactoryGuy.hasMany('step', 2)
-//  }
-//})
-//
-//FactoryGuy.define('step', {
-//  default: {}
-//})
+Step = DS.Model.extend({
+  progress: DS.belongsTo('progress')
+})
+
+
+FactoryGuy.define( 'progress', {
+  default: {}
+});
+FactoryGuy.define( 'step', {
+  default: {
+    progress: FactoryGuy.belongsTo('progress')
+  }
+});
+FactoryGuy.define( 'lesson', {
+  default: {
+    steps: FactoryGuy.hasMany('step', 2),
+    progress: FactoryGuy.belongsTo('progress')
+  }
+});
+FactoryGuy.define( 'unit', {
+  default: {
+    lesson: FactoryGuy.belongsTo('lesson')
+  }
+});

data/tests/support/models/hat.js

@@ -1,6 +1,7 @@
 Hat = DS.Model.extend({
   type: DS.attr('string'),
   user: DS.belongsTo('user'),
+  outfit: DS.belongsTo('outfit'),
   hat:  DS.belongsTo('hat', {inverse: 'hats', polymorphic: true}),
   hats: DS.hasMany('hat', {inverse: 'hat', polymorphic: true}),
   fluffy_materials: DS.hasMany('fluffy_materials')

data/tests/support/models/outfit.js

@@ -0,0 +1,4 @@
+Outfit = DS.Model.extend({
+  name: DS.attr('string'),
+  hats: DS.hasMany('hat', {polymorphic: true})
+})

data/tests/support/models/user.js

@@ -5,3 +5,4 @@ User = DS.Model.extend({
   projects:   DS.hasMany('project'),
   hats:       DS.hasMany('hat', {polymorphic: true})
 });
+

data/tests/support/test_helper.js

@@ -15,7 +15,9 @@ TestHelper = Ember.Object.createWithMixins(FactoryGuyTestMixin,{
       small_hat: SmallHat,
       big_hat: BigHat,
       soft_material: SoftMaterial,
+      softMaterial: SoftMaterial,
       fluffy_material: FluffyMaterial,
+      fluffyMaterial: FluffyMaterial,
       profile: Profile,
       user: User,
       company: Company,
@@ -24,7 +26,8 @@ TestHelper = Ember.Object.createWithMixins(FactoryGuyTestMixin,{
       project: Project,
       group: Group,
       big_group: BigGroup,
-      small_group: SmallGroup
+      small_group: SmallGroup,
+      outfit: Outfit
     })
 
     if (adapter instanceof DS.FixtureAdapter) {
@@ -36,52 +39,7 @@ TestHelper = Ember.Object.createWithMixins(FactoryGuyTestMixin,{
 });
 
 
-/* globals ENV, QUnit */
-
 (function (){
-  window.Ember = window.Ember || {};
-
-  Ember.config = {};
-  Ember.testing = true;
-  Ember.LOG_VERSION = false;
-
-  window.ENV = { TESTING: true, LOG_VERSION: false };
-
-  var extendPrototypes = QUnit.urlParams.extendprototypes;
-  ENV['EXTEND_PROTOTYPES'] = !!extendPrototypes;
-
-  window.async = function(callback, timeout) {
-    stop();
-
-    timeout = setTimeout(function() {
-      start();
-      ok(false, "Timeout was reached");
-    }, timeout || 200);
-
-    return function() {
-      clearTimeout(timeout);
-
-      start();
-
-      var args = arguments;
-      return Ember.run(function() {
-        return callback.apply(this, args);
-      });
-    };
-  };
-
-  window.asyncEqual = function(a, b, message) {
-    Ember.RSVP.all([ Ember.RSVP.resolve(a), Ember.RSVP.resolve(b) ]).then(async(function(array) {
-      /*globals QUnit*/
-      QUnit.push(array[0] === array[1], array[0], array[1], message);
-    }));
-  };
-
-  window.invokeAsync = function(callback, timeout) {
-    timeout = timeout || 1;
-
-    setTimeout(async(callback, timeout+100), timeout);
-  };
 
   window.setupStore = function(options) {
     var env = {};
@@ -108,9 +66,7 @@ TestHelper = Ember.Object.createWithMixins(FactoryGuyTestMixin,{
     }
 
     container.register('serializer:-default', serializer);
-
     container.register('transform:string', DS.StringTransform);
-
     container.injection('serializer', 'store', 'store:main');
 
     env.store = container.lookup('store:main');
@@ -123,148 +79,4 @@ TestHelper = Ember.Object.createWithMixins(FactoryGuyTestMixin,{
     return setupStore(options).store;
   };
 
-  var async = window.async  = function(callback, timeout) {
-     stop();
-
-     timeout = setTimeout(function() {
-       start();
-       ok(false, "Timeout was reached");
-     }, timeout || 200);
-
-     return function() {
-       clearTimeout(timeout);
-
-       start();
-
-       var args = arguments;
-       return Ember.run(function() {
-         return callback.apply(this, args);
-       });
-     };
-   };
-
-  var syncForTest = window.syncForTest = function(fn) {
-    var callSuper;
-
-    if (typeof fn !== "function") { callSuper = true; }
-
-    return function() {
-      var override = false, ret;
-
-      if (Ember.run && !Ember.run.currentRunLoop) {
-        Ember.run.begin();
-        override = true;
-      }
-
-      try {
-        if (callSuper) {
-          ret = this._super.apply(this, arguments);
-        } else {
-          ret = fn.apply(this, arguments);
-        }
-      } finally {
-        if (override) {
-          Ember.run.end();
-        }
-      }
-
-      return ret;
-    };
-  };
-
-  Ember.config.overrideAccessors = function() {
-    Ember.set = syncForTest(Ember.set);
-    Ember.get = syncForTest(Ember.get);
-  };
-
-  Ember.config.overrideClassMixin = function(ClassMixin) {
-    ClassMixin.reopen({
-      create: syncForTest()
-    });
-  };
-
-  Ember.config.overridePrototypeMixin = function(PrototypeMixin) {
-    PrototypeMixin.reopen({
-      destroy: syncForTest()
-    });
-  };
-
-  QUnit.begin(function(){
-    Ember.RSVP.configure('onerror', function(reason) {
-      // only print error messages if they're exceptions;
-      // otherwise, let a future turn of the event loop
-      // handle the error.
-      if (reason && reason instanceof Error) {
-        Ember.Logger.log(reason, reason.stack);
-        throw reason;
-      }
-    });
-
-    Ember.RSVP.resolve = syncForTest(Ember.RSVP.resolve);
-
-    Ember.View.reopen({
-      _insertElementLater: syncForTest()
-    });
-
-    DS.Store.reopen({
-      save: syncForTest(),
-      createRecord: syncForTest(),
-      deleteRecord: syncForTest(),
-      push: syncForTest(),
-      pushMany: syncForTest(),
-      filter: syncForTest(),
-      find: syncForTest(),
-      findMany: syncForTest(),
-      findByIds: syncForTest(),
-      didSaveRecord: syncForTest(),
-      didSaveRecords: syncForTest(),
-      didUpdateAttribute: syncForTest(),
-      didUpdateAttributes: syncForTest(),
-      didUpdateRelationship: syncForTest(),
-      didUpdateRelationships: syncForTest(),
-      scheduleFetch: syncForTest(),
-      scheduleFetchMany: syncForTest()
-    });
-
-    DS.Model.reopen({
-      save: syncForTest(),
-      reload: syncForTest(),
-      deleteRecord: syncForTest(),
-      dataDidChange: Ember.observer(syncForTest(), 'data'),
-      updateRecordArraysLater: syncForTest(),
-      updateRecordArrays: syncForTest()
-    });
-
-    DS.Errors.reopen({
-      add: syncForTest(),
-      remove: syncForTest(),
-      clear: syncForTest()
-    });
-
-    DS.Relationship.prototype.addRecord = syncForTest(DS.Relationship.prototype.addRecord);
-    DS.Relationship.prototype.removeRecord = syncForTest(DS.Relationship.prototype.removeRecord);
-    DS.Relationship.prototype.removeRecordFromInverse = syncForTest(DS.Relationship.prototype.removeRecordFromInverse);
-    DS.Relationship.prototype.removeRecordFromOwn = syncForTest(DS.Relationship.prototype.removeRecordFromOwn);
-
-    var transforms = {
-      'boolean': DS.BooleanTransform.create(),
-      'date': DS.DateTransform.create(),
-      'number': DS.NumberTransform.create(),
-      'string': DS.StringTransform.create()
-    };
-
-    // Prevent all tests involving serialization to require a container
-    DS.JSONSerializer.reopen({
-      transformFor: function(attributeType) {
-        return this._super(attributeType, true) || transforms[attributeType];
-      }
-    });
-
-    Ember.RSVP.Promise.prototype.then = syncForTest(Ember.RSVP.Promise.prototype.then);
-  });
-
-  // Generate the jQuery expando on window ahead of time
-  // to make the QUnit global check run clean
-  jQuery(window).data('testing', true);
-
 })();

data/tests/test_setup.js

@@ -52,6 +52,14 @@ FactoryGuy.define('hat', {
   },
   big_hat: {
     type: 'BigHat'
+  },
+  traits: {
+    belonging_to_user: {
+      user: FactoryGuy.belongsTo('user')
+    },
+    belonging_to_outfit: {
+      outfit: FactoryGuy.belongsTo('outfit')
+    }
   }
 })
 FactoryGuy.define('soft_material', {
@@ -71,9 +79,23 @@ FactoryGuy.define('fluffy_material', {
     name: 'fluff'
   }
 })
+FactoryGuy.define("outfit", {
+  sequences: {
+    name: function(num) {return 'Outfit' + num}
+  },
+  default: {
+    name: FactoryGuy.generate('name')
+  }
+});
+
 FactoryGuy.define('profile', {
   default: {
     description: 'Text goes here'
+  },
+  traits: {
+    goofy_description: {
+      description: 'goofy'
+    }
   }
 })
 FactoryGuy.define("project", {
@@ -85,6 +107,8 @@ FactoryGuy.define("project", {
     with_title_sequence: { title: FactoryGuy.generate('title') },
     with_user: { user: {} },
     with_user_having_hats: { user: FactoryGuy.belongsTo('user', 'with_hats') },
+    with_user_having_hats_belonging_to_user: { user: FactoryGuy.belongsTo('user', 'with_hats_belonging_to_user') },
+    with_user_having_hats_belonging_to_outfit: { user: FactoryGuy.belongsTo('user', 'with_hats_belonging_to_outfit') },
     with_dude: { user: {name: 'Dude'} },
     with_admin: { user: FactoryGuy.belongsTo('admin') }
   },
@@ -126,9 +150,12 @@ FactoryGuy.define('property', {
   }
 })
 FactoryGuy.define('user', {
+  sequences: {
+    name: function(num) {return 'User' + num}
+  },
   // default values for 'user' attributes
   default: {
-    name: 'User1'
+    name: FactoryGuy.generate('name')
   },
   // named 'user' type with custom attributes
   admin: {
@@ -143,39 +170,50 @@ FactoryGuy.define('user', {
     },
     with_hats: {
       hats: FactoryGuy.hasMany('big_hat', 2)
+    },
+    with_hats_belonging_to_user: {
+      hats: FactoryGuy.hasMany('big_hat', 2, 'belonging_to_user')
+    },
+    with_hats_belonging_to_outfit: {
+      hats: FactoryGuy.hasMany('big_hat', 2, 'belonging_to_outfit')
     }
   }
 });
 
+Progress = DS.Model.extend({});
+Unit = DS.Model.extend({
+  lesson: DS.belongsTo('lesson')
+})
 
-//Unit = DS.Model.extend({
-//  lesson: DS.belongsTo('lesson')
-//})
-//
-//Lesson = DS.Model.extend({
-//  steps: DS.hasMany('step')
-//})
-//
-//Step = DS.Model.extend({
-//  lesson: DS.belongsTo ('lesson')
-//})
-//
-//
-//FactoryGuy.define('unit', {
-//  default: {
-//    lesson: FactoryGuy.belongsTo('lesson')
-//  }
-//})
-//
-//FactoryGuy.define('lesson', {
-//  default: {
-//    steps: FactoryGuy.hasMany('step', 2)
-//  }
-//})
-//
-//FactoryGuy.define('step', {
-//  default: {}
-//})
+Lesson = DS.Model.extend({
+  steps: DS.hasMany('step'),
+  progress: DS.belongsTo('progress')
+})
+
+Step = DS.Model.extend({
+  progress: DS.belongsTo('progress')
+})
+
+
+FactoryGuy.define( 'progress', {
+  default: {}
+});
+FactoryGuy.define( 'step', {
+  default: {
+    progress: FactoryGuy.belongsTo('progress')
+  }
+});
+FactoryGuy.define( 'lesson', {
+  default: {
+    steps: FactoryGuy.hasMany('step', 2),
+    progress: FactoryGuy.belongsTo('progress')
+  }
+});
+FactoryGuy.define( 'unit', {
+  default: {
+    lesson: FactoryGuy.belongsTo('lesson')
+  }
+});
 
 Company = DS.Model.extend({
   name:    DS.attr('string'),
@@ -205,6 +243,7 @@ SmallGroup = Group.extend({
 Hat = DS.Model.extend({
   type: DS.attr('string'),
   user: DS.belongsTo('user'),
+  outfit: DS.belongsTo('outfit'),
   hat:  DS.belongsTo('hat', {inverse: 'hats', polymorphic: true}),
   hats: DS.hasMany('hat', {inverse: 'hat', polymorphic: true}),
   fluffy_materials: DS.hasMany('fluffy_materials')
@@ -227,6 +266,11 @@ FluffyMaterial = DS.Model.extend({
   hat:  DS.belongsTo('hat', {polymorphic: true})
 })
 
+Outfit = DS.Model.extend({
+  name: DS.attr('string'),
+  hats: DS.hasMany('hat', {polymorphic: true})
+})
+
 Profile = DS.Model.extend({
   description:            DS.attr('string'),
   camelCaseDescription:   DS.attr('string'),
@@ -259,6 +303,7 @@ User = DS.Model.extend({
   hats:       DS.hasMany('hat', {polymorphic: true})
 });
 
+
 /*!
  * MockJax - jQuery Plugin to Mock Ajax requests
  *