ember-data-factory-guy 0.9.8 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0650e66ee950da634303e3cc9ff5a32a6f9a5c5b
-  data.tar.gz: da9d920628d9c30787d4c4ffcd53fa6285b6ed33
+  metadata.gz: 6e4648a11858529bb5355b440b02b0ca24a7f8bf
+  data.tar.gz: 423900ef7416682118d3c180677af2f8fcf77468
 SHA512:
-  metadata.gz: 01cf3a560b474549974245e618bbd235ab81719420672a24ae28b333643f5cfa009b2522130e252e56508541b549f711baab63d601c6662296e29e975c5b302b
-  data.tar.gz: 94a67fcb425895b84bb93fc82393d036ba206749bb29a0e482591fcd677e87fd0a81087d21a300cd3ce87c6daf4b30899bba1bc484702b9b5686f2868e4ea98d
+  metadata.gz: 611b82bee5d7602ed3d0294fe0d4cc1e66061ab0c98f103de3250a9be83b9e082652505dccd4c6b5bf33ee45f3008b4c9a62bac5f131741f4ab95b9a85c7d970
+  data.tar.gz: 9efc3f1265f49dc5ebec18410d018e67077132be6298b9aaa547acab83fe839c70d961c6771d81e6bab0c97cd3711c65ed6ef01a86d9b477c26290414dd67c21

data/README.md

@@ -14,12 +14,10 @@ of ember-data-factory-guy.
   - 0.6.4   -> ember-data-1.0.0-beta.8 and under
   - 0.7.1.1 -> ember-data-1.0.0-beta.10
   - 0.8.6   -> ember-data-1.0.0-beta.11
-  - 0.9.7   -> ember-data-1.0.0-beta.12
+  - 0.9.8   -> ember-data-1.0.0-beta.12
+  - 0.9.9   -> ember-data-1.0.0-beta.15
 
-**Waiting for ember-data-1.0.0-beta.15 to make upgrade release, since there are a few issues with
- ember-data-1.0.0-beta.14.1 that make it difficult to use**
-
-**Support for fixture adapter is back in business as of version 0.9.3**
+**Support for fixture adapter is working for versions 0.9.3 -> 0.9.8**
 
 *Version 0.9.0 and up deprecates explicit call to store.makeFixture in your tests, in favor
 of using the FactoryGuy.make or testHelper.make function from FactoryGuyTestHelperMixin instead.
@@ -46,7 +44,7 @@ gem 'ember-data-factory-guy', group: test
 or for particular version:
 
 ```ruby
-gem 'ember-data-factory-guy', '0.9.7', group: test
+gem 'ember-data-factory-guy', '0.9.9', group: test
 ```
 
 then:
@@ -81,7 +79,7 @@ or for particular version:
   "dependencies": {
     "foo-dependency": "latest",
     "other-foo-dependency": "latest",
-    "ember-data-factory-guy": "0.9.7"
+    "ember-data-factory-guy": "0.9.9"
   }
 ```
 
@@ -713,6 +711,8 @@ tests run as shown in the previous section (Using FactoryGuyTestMixin)**
     - succeed - flag to indicate if the request should succeed ( default is true )
     - this style will eventually be deprecated
 
+  - need to wrap tests using handleCreate with: Ember.run.function() { 'your test' })
+
 **Note**
 
   *Any attributes in match will be added to the response json automatically,
@@ -816,6 +816,7 @@ chainable methods, or options hash.
 ##### handleUpdate
   - handleUpdate(model)
   - handleUpdate(modelType, id)
+  - need to wrap tests using handleUpdate with: Ember.run.function() { 'your test' })
 
 *success case is the default*
 
@@ -850,6 +851,7 @@ chainable methods, or options hash.
 
 
 ##### handleDelete
+  - need to wrap tests using handleDelete with: Ember.run.function() { 'your test' })
 
 *success case is the default*
 
@@ -900,32 +902,34 @@ module('User View', {
 });
 
 test("Creates new project", function() {
-  andThen(function() {
-    var newProjectName  = "Gonzo Project"
-
-    click('.add-div div:contains(New Project)')
-    fillIn('.add-project input', newProjectName)
-
-    // Remember, this is for handling an exact match, if you did not care about
-    // matching attributes, you could just do: viewHelper.handleCreate('project')
-    viewHelper.handleCreate('project', {match:{name: newProjectName, user:user}})
-
-    /**
-     Let's say that clicking this '.add-project .link', triggers action in the view to
-     create project record and looks something like this:
-
-        actions: {
-          addProject: function (user) {
-            var name = this.$('.add-project input').val();
-            var store = this.get('controller.store');
-            store.createRecord('project', {name: name, user: user}).save();
-          }
-
-    */
-    click('.add-project .link')
-
-    var newProjectDiv = find('.project:contains('+newProjectName+')')
-    equal(newProjectDiv[0] != undefined, true)
+  Em.run(function() {
+    andThen(function() {
+      var newProjectName  = "Gonzo Project"
+
+      click('.add-div div:contains(New Project)')
+      fillIn('.add-project input', newProjectName)
+
+      // Remember, this is for handling an exact match, if you did not care about
+      // matching attributes, you could just do: viewHelper.handleCreate('project')
+      viewHelper.handleCreate('project', {match:{name: newProjectName, user:user}})
+
+      /**
+       Let's say that clicking this '.add-project .link', triggers action in the view to
+       create project record and looks something like this:
+
+          actions: {
+            addProject: function (user) {
+              var name = this.$('.add-project input').val();
+              var store = this.get('controller.store');
+              store.createRecord('project', {name: name, user: user}).save();
+            }
+
+      */
+      click('.add-project .link')
+
+      var newProjectDiv = find('.project:contains('+newProjectName+')')
+      equal(newProjectDiv[0] != undefined, true)
+    })
   })
 })
 

data/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-data-factory-guy",
-  "version": "0.9.8",
+  "version": "0.9.9",
   "authors": [
     "Daniel Sudol <dansudol@yahoo.com>",
     "Opak Alex <opak.alexandr@gmail.com>"
@@ -15,7 +15,7 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "ember-data": "1.0.0-beta.12",
+    "ember-data": "1.0.0-beta.15",
     "jquery-mockjax": "latest"
   },
   "ignore": [

data/package.json

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

data/tests/active_model_adapter_factory_test.js

@@ -14,24 +14,26 @@ module('FactoryGuy with ActiveModelAdapter', {
 
 
 test("#resetModels clears the store of models, and resets the model definition", function() {
-  var project = make('project');
-  var user = make('user', {projects: [project]});
+  Em.run(function() {
+    var project = make('project');
+    var user = make('user', {projects: [project]});
 
-  for (model in FactoryGuy.modelDefinitions) {
-    var definition = FactoryGuy.modelDefinitions[model];
-    sinon.spy(definition, 'reset');
-  }
+    for (model in FactoryGuy.modelDefinitions) {
+      var definition = FactoryGuy.modelDefinitions[model];
+      sinon.spy(definition, 'reset');
+    }
 
-  FactoryGuy.resetModels(store);
+    FactoryGuy.resetModels(store);
 
-  equal(store.all('user').get('content.length'),0)
-  equal(store.all('project').get('content.length'),0)
+    equal(store.all('user').get('content.length'),0)
+    equal(store.all('project').get('content.length'),0)
 
-  for (model in FactoryGuy.modelDefinitions) {
-    var definition = FactoryGuy.modelDefinitions[model];
-    ok(definition.reset.calledOnce);
-    definition.reset.restore();
-  }
+    for (model in FactoryGuy.modelDefinitions) {
+      var definition = FactoryGuy.modelDefinitions[model];
+      ok(definition.reset.calledOnce);
+      definition.reset.restore();
+    }
+  });
 });
 
 

data/tests/factory_guy_test_mixin_test.js

@@ -31,26 +31,30 @@ module('FactoryGuyTestMixin (using mockjax) with DS.RESTAdapter', {
     make = function() {return FactoryGuy.make.apply(FactoryGuy,arguments)}
   },
   teardown: function () {
-    testHelper.teardown();
+    Em.run(function() {
+      testHelper.teardown();
+    });
   }
 });
 
 /////// handleCreate //////////
 
 asyncTest("#handleCreate the basic", function() {
-  var customDescription = "special description"
-
-  testHelper.handleCreate('profile', {
-    match: {description: customDescription}
-  })
-  ok(store.all('profile').get('content.length') == 0)
-  store.createRecord('profile', {
-    description: customDescription
-  }).save().then(function(profile) {
-    ok(store.all('profile').get('content.length') == 1, 'No extra records created')
-    ok(profile instanceof Profile, 'Creates the correct type of record')
-    ok(profile.get('description') == customDescription, 'Passes along the match attributes')
-    start();
+  Em.run(function() {
+    var customDescription = "special description"
+
+    testHelper.handleCreate('profile', {
+      match: {description: customDescription}
+    })
+    ok(store.all('profile').get('content.length') == 0)
+    store.createRecord('profile', {
+      description: customDescription
+    }).save().then(function(profile) {
+      ok(store.all('profile').get('content.length') == 1, 'No extra records created')
+      ok(profile instanceof Profile, 'Creates the correct type of record')
+      ok(profile.get('description') == customDescription, 'Passes along the match attributes')
+      start();
+    });
   });
 });
 
@@ -175,14 +179,15 @@ asyncTest("#handleFind with a record returns the record", function () {
 });
 
 asyncTest("#handleFind with a record handles reload", function () {
-  var profile = FactoryGuy.make('profile')
-  testHelper.handleFind(profile);
+  Em.run(function() {
+    var profile = FactoryGuy.make('profile')
+    testHelper.handleFind(profile);
 
-  profile.reload().then(function (profile2) {
-    ok(profile2.id == profile.id);
-    start();
+    profile.reload().then(function (profile2) {
+      ok(profile2.id == profile.id);
+      start();
+    });
   });
-
 });
 
 asyncTest("#handleFind with options", function () {
@@ -237,7 +242,9 @@ module('FactoryGuyTestMixin (using mockjax) with DS.ActiveModelAdapter', {
     make = function() {return FactoryGuy.make.apply(FactoryGuy,arguments)}
   },
   teardown: function () {
-    testHelper.teardown();
+    Em.run(function() {
+      testHelper.teardown();
+    });
   }
 });
 
@@ -246,274 +253,311 @@ module('FactoryGuyTestMixin (using mockjax) with DS.ActiveModelAdapter', {
 
 /////// with hash of parameters ///////////////////
 asyncTest("#handleCreate with no specific match", function() {
-  testHelper.handleCreate('profile');
+  Em.run(function() {
+    testHelper.handleCreate('profile');
 
-  store.createRecord('profile', {description: 'whatever'}).save().then(function(profile) {
-    ok(profile.id == 1)
-    ok(profile.get('description') == 'whatever')
-    start();
+    store.createRecord('profile', {description: 'whatever'}).save().then(function(profile) {
+      ok(profile.id == 1)
+      ok(profile.get('description') == 'whatever')
+      start();
+    });
   });
 });
 
 asyncTest("#handleCreate match some attributes", function() {
-  var customDescription = "special description"
-  var date = new Date();
-
-  testHelper.handleCreate('profile', {
-    match: {description: customDescription}
+  Em.run(function() {
+    var customDescription = "special description"
+    var date = new Date();
+
+    testHelper.handleCreate('profile', {
+      match: {description: customDescription}
+    })
+
+    store.createRecord('profile', {
+      description: customDescription, created_at: date
+    }).save().then(function (profile) {
+      ok(profile instanceof Profile)
+      ok(profile.id == 1)
+      ok(profile.get('description') == customDescription)
+      start();
+    });
   })
-
-  store.createRecord('profile', {
-    description: customDescription, created_at: date
-  }).save().then(function(profile) {
-    ok(profile instanceof Profile)
-    ok(profile.id == 1)
-    ok(profile.get('description') == customDescription)
-    start();
-  });
 });
 
 asyncTest("#handleCreate match all attributes", function() {
-  var customDescription = "special description"
-  var date = new Date();
-
-  testHelper.handleCreate('profile', {
-    match: {description: customDescription, created_at: date}
-  })
-
-  store.createRecord('profile', {
-    description: customDescription, created_at: date
-  }).save().then(function(profile) {
-    ok(profile instanceof Profile)
-    ok(profile.id == 1)
-    ok(profile.get('description') == customDescription)
-    ok(profile.get('created_at') == date.toString())
-    start();
+  Em.run(function() {
+    var customDescription = "special description"
+    var date = new Date();
+
+    testHelper.handleCreate('profile', {
+      match: {description: customDescription, created_at: date}
+    })
+
+    store.createRecord('profile', {
+      description: customDescription, created_at: date
+    }).save().then(function(profile) {
+      ok(profile instanceof Profile)
+      ok(profile.id == 1)
+      ok(profile.get('description') == customDescription)
+      ok(profile.get('created_at') == date.toString())
+      start();
+    });
   });
 });
 
 
 asyncTest("#handleCreate returns attributes", function() {
-  var date = new Date()
+  Em.run(function() {
+    var date = new Date()
 
-  testHelper.handleCreate('profile', {
-    returns: {created_at: date}
-  })
+    testHelper.handleCreate('profile', {
+      returns: {created_at: date}
+    })
 
-  store.createRecord('profile').save().then(function(profile) {
-    ok(profile.get('created_at') == date.toString())
-    start();
+    store.createRecord('profile').save().then(function(profile) {
+      ok(profile.get('created_at') == date.toString())
+      start();
+    });
   });
 });
 
 asyncTest("#handleCreate returns camelCase attributes", function() {
-  var customDescription = "special description"
+  Em.run(function() {
+    var customDescription = "special description"
 
-  testHelper.handleCreate('profile', {
-    returns: {camel_case_description: customDescription}
-  })
+    testHelper.handleCreate('profile', {
+      returns: {camel_case_description: customDescription}
+    })
 
-  store.createRecord('profile', {
-    camel_case_description: 'description'
-  }).save().then(function(profile) {
-    ok(profile.get('camelCaseDescription') == customDescription)
-    start();
+    store.createRecord('profile', {
+      camel_case_description: 'description'
+    }).save().then(function(profile) {
+      ok(profile.get('camelCaseDescription') == customDescription)
+      start();
+    });
   });
 });
 
 asyncTest("#handleCreate match belongsTo association", function() {
-  var company = make('company')
-  testHelper.handleCreate('profile', {match:{ company: company}})
+  Em.run(function() {
+    var company = make('company')
+    testHelper.handleCreate('profile', {match:{ company: company}})
 
-  store.createRecord('profile', {company: company}).save().then(function(profile) {
-    ok(profile.get('company') == company)
-    start();
+    store.createRecord('profile', {company: company}).save().then(function(profile) {
+      ok(profile.get('company') == company)
+      start();
+    });
   });
 });
 
 asyncTest("#handleCreate match belongsTo polymorphic association", function() {
-  var group = make('group')
-  testHelper.handleCreate('profile', {match:{ group: group}})
+  Em.run(function() {
+    var group = make('group')
+    testHelper.handleCreate('profile', {match:{ group: group}})
 
-  store.createRecord('profile', {group: group}).save().then(function(profile) {
-    ok(profile.get('group') == group)
-    start();
+    store.createRecord('profile', {group: group}).save().then(function(profile) {
+      ok(profile.get('group') == group)
+      start();
+    });
   });
 });
 
 
 asyncTest("#handleCreate match attributes and return attributes", function() {
-  var date = new Date()
-  var customDescription = "special description"
-  var company = make('company')
-  var group = make('big_group')
-
-  testHelper.handleCreate('profile', {
-    match: {description: customDescription, company: company, group: group},
-    returns: {created_at: new Date()}
-  })
-
-  store.createRecord('profile', {
-    description: customDescription, company: company, group: group
-  }).save().then(function(profile) {
-    start();
-    ok(profile.get('created_at') == date.toString())
-    ok(profile.get('group') == group)
-    ok(profile.get('company') == company)
-    ok(profile.get('description') == customDescription)
+  Em.run(function() {
+    var date = new Date()
+    var customDescription = "special description"
+    var company = make('company')
+    var group = make('big_group')
+
+    testHelper.handleCreate('profile', {
+      match: {description: customDescription, company: company, group: group},
+      returns: {created_at: new Date()}
+    })
+
+    store.createRecord('profile', {
+      description: customDescription, company: company, group: group
+    }).save().then(function(profile) {
+      start();
+      ok(profile.get('created_at') == date.toString())
+      ok(profile.get('group') == group)
+      ok(profile.get('company') == company)
+      ok(profile.get('description') == customDescription)
+    });
   });
 });
 
 
 asyncTest("#handleCreate failure", function() {
-  testHelper.handleCreate('profile', { succeed: false } )
+  Em.run(function() {
+    testHelper.handleCreate('profile', { succeed: false } )
 
-  store.createRecord('profile').save()
-    .then(
-      function() {},
-      function() {
-        ok(true)
-        start();
-      }
-    )
+    store.createRecord('profile').save()
+      .then(
+        function() {},
+        function() {
+          ok(true)
+          start();
+        }
+      )
+  });
 });
 
 
 asyncTest("#handleCreate match but still fail", function() {
-  var description = "special description"
+  Em.run(function() {
+    var description = "special description"
 
-  testHelper.handleCreate('profile', {
-    match: {description: description}, succeed: false
-  })
+    testHelper.handleCreate('profile', {
+      match: {description: description}, succeed: false
+    })
 
-  store.createRecord('profile', {description: description}).save()
-    .then(
-      function() {},
-      function() {
-        ok(true)
-        start();
-      }
-    )
+    store.createRecord('profile', {description: description}).save()
+      .then(
+        function() {},
+        function() {
+          ok(true)
+          start();
+        }
+      )
+  });
 });
 
 /////// handleCreate //////////
 /////// with chaining methods ///////////////////
 
 asyncTest("#handleCreate match some attributes with match method", function() {
-  var customDescription = "special description"
-  var date = new Date();
-
-  testHelper.handleCreate('profile').match({description: customDescription});
-
-  store.createRecord('profile', {
-    description: customDescription, created_at: date
-  }).save().then(function(profile) {
-    ok(profile instanceof Profile)
-    ok(profile.id == 1)
-    ok(profile.get('description') == customDescription)
-    start();
+  Em.run(function() {
+    var customDescription = "special description"
+    var date = new Date();
+
+    testHelper.handleCreate('profile').match({description: customDescription});
+
+    store.createRecord('profile', {
+      description: customDescription, created_at: date
+    }).save().then(function(profile) {
+      ok(profile instanceof Profile)
+      ok(profile.id == 1)
+      ok(profile.get('description') == customDescription)
+      start();
+    });
   });
 });
 
 asyncTest("#handleCreate match all attributes  with match method", function() {
-  var customDescription = "special description"
-  var date = new Date();
-
-  testHelper.handleCreate('profile').match({description: customDescription, created_at: date});
-
-  store.createRecord('profile', {
-    description: customDescription, created_at: date
-  }).save().then(function(profile) {
-    ok(profile instanceof Profile)
-    ok(profile.id == 1)
-    ok(profile.get('description') == customDescription)
-    ok(profile.get('created_at') == date.toString())
-    start();
+  Em.run(function() {
+    var customDescription = "special description"
+    var date = new Date();
+
+    testHelper.handleCreate('profile').match({description: customDescription, created_at: date});
+
+    store.createRecord('profile', {
+      description: customDescription, created_at: date
+    }).save().then(function(profile) {
+      ok(profile instanceof Profile)
+      ok(profile.id == 1)
+      ok(profile.get('description') == customDescription)
+      ok(profile.get('created_at') == date.toString())
+      start();
+    });
   });
 });
 
 asyncTest("#handleCreate match belongsTo association with match method", function() {
-  var company = make('company')
-  testHelper.handleCreate('profile').match({company: company})
+  Em.run(function() {
+    var company = make('company')
 
-  store.createRecord('profile', {company: company}).save().then(function(profile) {
-    ok(profile.get('company') == company)
-    start();
+    testHelper.handleCreate('profile').match({company: company})
+
+    store.createRecord('profile', {company: company}).save().then(function(profile) {
+      ok(profile.get('company') == company)
+      start();
+    });
   });
 });
 
 asyncTest("#handleCreate match belongsTo polymorphic association  with match method", function() {
-  var group = make('group')
-  testHelper.handleCreate('profile').match({group: group})
+  Em.run(function() {
+    var group = make('group')
+    testHelper.handleCreate('profile').match({group: group})
 
-  store.createRecord('profile', {group: group}).save().then(function(profile) {
-    ok(profile.get('group') == group)
-    start();
+    store.createRecord('profile', {group: group}).save().then(function(profile) {
+      ok(profile.get('group') == group)
+      start();
+    });
   });
 });
 
 
 
 asyncTest("#handleCreate returns attributes with andReturns method", function() {
-  var date = new Date()
+  Em.run(function() {
+    var date = new Date()
 
-  testHelper.handleCreate('profile').andReturn({created_at: date});
+    testHelper.handleCreate('profile').andReturn({created_at: date});
 
-  store.createRecord('profile').save().then(function(profile) {
-    ok(profile.get('created_at') == date.toString())
-    start();
+    store.createRecord('profile').save().then(function(profile) {
+      ok(profile.get('created_at') == date.toString())
+      start();
+    });
   });
 });
 
 asyncTest("#handleCreate match attributes and return attributes with match and andReturn methods", function() {
-  var date = new Date()
-  var customDescription = "special description"
-  var company = make('company')
-  var group = make('big_group')
-
-  testHelper.handleCreate('profile')
-    .match({description: customDescription, company: company, group: group})
-    .andReturn({created_at: new Date()})
-
-  store.createRecord('profile', {
-    description: customDescription, company: company, group: group
-  }).save().then(function(profile) {
-    start();
-    ok(profile.get('created_at') == date.toString())
-    ok(profile.get('group') == group)
-    ok(profile.get('company') == company)
-    ok(profile.get('description') == customDescription)
+  Em.run(function() {
+    var date = new Date()
+    var customDescription = "special description"
+    var company = make('company')
+    var group = make('big_group')
+
+    testHelper.handleCreate('profile')
+      .match({description: customDescription, company: company, group: group})
+      .andReturn({created_at: new Date()})
+
+    store.createRecord('profile', {
+      description: customDescription, company: company, group: group
+    }).save().then(function(profile) {
+      start();
+      ok(profile.get('created_at') == date.toString())
+      ok(profile.get('group') == group)
+      ok(profile.get('company') == company)
+      ok(profile.get('description') == customDescription)
+    });
   });
 });
 
 
 asyncTest("#handleCreate failure with andFail method", function() {
-  testHelper.handleCreate('profile').andFail();
+  Em.run(function() {
+    testHelper.handleCreate('profile').andFail();
 
-  store.createRecord('profile').save()
-    .then(
-      function() {},
-      function() {
-        ok(true)
-        start();
-      }
-    )
+    store.createRecord('profile').save()
+      .then(
+        function() {},
+        function() {
+          ok(true)
+          start();
+        }
+      )
+  });
 });
 
 
 asyncTest("#handleCreate match but still fail with chaining methods", function() {
-  var description = "special description"
+  Em.run(function() {
+    var description = "special description"
 
-  testHelper.handleCreate('profile').match({description: description}).andFail();
+    testHelper.handleCreate('profile').match({description: description}).andFail();
 
-  store.createRecord('profile', {description: description}).save()
-    .then(
-      function() {},
-      function() {
-        ok(true)
-        start();
-      }
-    )
+    store.createRecord('profile', {description: description}).save()
+      .then(
+        function() {},
+        function() {
+          ok(true)
+          start();
+        }
+      )
+  });
 });
 
 
@@ -584,78 +628,91 @@ test("#handleUpdate with incorrect parameters", function(assert) {
 });
 
 asyncTest("#handleUpdate the with modelType and id", function() {
-  var profile = make('profile');
-  testHelper.handleUpdate('profile', profile.id);
+  Em.run(function() {
+    var profile = make('profile');
+    testHelper.handleUpdate('profile', profile.id);
 
-  profile.set('description','new desc');
-  profile.save().then(function(profile) {
-    ok(profile.get('description') == 'new desc');
-    start();
+    profile.set('description','new desc');
+    profile.save().then(function(profile) {
+      ok(profile.get('description') == 'new desc');
+      start();
+    });
   });
 });
 
 
 asyncTest("#handleUpdate the with model", function() {
-  var profile = make('profile');
-  testHelper.handleUpdate(profile, true, {e:1});
+  Em.run(function() {
+    var profile = make('profile');
+    testHelper.handleUpdate(profile, true, {e:1});
 
-  profile.set('description','new desc');
-  profile.save().then(function(profile) {
-    ok(profile.get('description') == 'new desc');
-    start();
+    profile.set('description','new desc');
+    profile.save().then(function(profile) {
+      ok(profile.get('description') == 'new desc');
+      start();
+    });
   });
 });
 
 asyncTest("#handleUpdate the with modelType and id that fails", function() {
-  var profile = make('profile');
-  testHelper.handleUpdate('profile', profile.id, false);
-
-  profile.set('description','new desc');
-  profile.save().then(
-    function() {},
-    function() {
-      ok(true)
-      start();
-    }
-  )
-});
-
-asyncTest("#handleUpdate with model that fails", function() {
-  var profile = make('profile');
-  testHelper.handleUpdate(profile, false);
+  Em.run(function() {
+    var profile = make('profile');
+    testHelper.handleUpdate('profile', profile.id, false);
 
-  profile.set('description','new desc');
-  profile.save().then(
+    profile.set('description','new desc');
+    profile.save().then(
       function() {},
       function() {
         ok(true)
         start();
       }
     )
+  });
+});
+
+asyncTest("#handleUpdate with model that fails", function() {
+  Em.run(function() {
+    var profile = make('profile');
+
+    testHelper.handleUpdate(profile, false);
+
+    profile.set('description','new desc');
+    profile.save().then(
+        function() {},
+        function() {
+          ok(true)
+          start();
+        }
+      )
+  });
 });
 
 
 /////// handleDelete //////////
 
 asyncTest("#handleDelete the basic", function() {
-  var profile = make('profile');
-  testHelper.handleDelete('profile', profile.id);
+  Em.run(function() {
+    var profile = make('profile');
+    testHelper.handleDelete('profile', profile.id);
 
-  profile.destroyRecord().then(function() {
-    equal(store.all('profile').get('content.length'), 0);
-    start();
+    profile.destroyRecord().then(function() {
+      equal(store.all('profile').get('content.length'), 0);
+      start();
+    });
   });
 });
 
 asyncTest("#handleDelete failure case", function() {
-  var profile = make('profile');
-  testHelper.handleDelete('profile', profile.id, false);
+  Em.run(function() {
+    var profile = make('profile');
+    testHelper.handleDelete('profile', profile.id, false);
 
-  profile.destroyRecord().then(
-    function() {},
-    function() {
-      ok(true);
-      start();
-    }
-  );
+    profile.destroyRecord().then(
+      function() {},
+      function() {
+        ok(true);
+        start();
+      }
+    );
+  });
 });

data/tests/fixture_adapter_factory_test.js

@@ -51,7 +51,9 @@ test("#resetModels clears the store of models, clears the FIXTURES arrays for ea
   equal(store.all('user').get('length'), 1);
   equal(store.all('project').get('length'), 1);
 
-  FactoryGuy.resetModels(store);
+  Em.run(function() {
+    FactoryGuy.resetModels(store);
+  });
 
   equal(User.FIXTURES.length, 0);
   equal(Project.FIXTURES.length, 0);

data/tests/index.html

@@ -24,20 +24,18 @@
     <script src='../tests/test_setup.js'></script>
     <script src='../tests/support/test_helper.js'></script>
 
-
-
 </head>
 <body>
 <div id="qunit"></div> <!-- QUnit fills this with results, etc -->
 <script src='active_model_adapter_factory_test.js'></script>
 <script src='rest_adapter_factory_test.js'></script>
-<script src='fixture_adapter_factory_test.js'></script>
+<!--<script src='fixture_adapter_factory_test.js'></script>-->
 <script src='store_test.js'></script>
 <script src='factory_guy_test.js'></script>
 <script src='factory_guy_test_mixin_test.js'></script>
 <div id='qunit-fixture'>
 
-    <!-- any HTML you want to be present in each test (will be reset for each test) -->
+<!-- any HTML you want to be present in each test (will be reset for each test) -->
 
 </div>
 </body>

data/tests/rest_adapter_factory_test.js

@@ -13,24 +13,26 @@ module('FactoryGuy with DS.RESTAdapter', {
 
 
 test("#resetModels clears the store of models, and resets the model definition", function() {
-  var project = make('project');
-  var user = make('user', {projects: [project]});
+  Em.run(function() {
+    var project = make('project');
+    var user = make('user', {projects: [project]});
 
-  for (model in FactoryGuy.modelDefinitions) {
-    var definition = FactoryGuy.modelDefinitions[model];
-    sinon.spy(definition, 'reset');
-  }
+    for (model in FactoryGuy.modelDefinitions) {
+      var definition = FactoryGuy.modelDefinitions[model];
+      sinon.spy(definition, 'reset');
+    }
 
-  FactoryGuy.resetModels(store);
+    FactoryGuy.resetModels(store);
 
-  equal(store.all('user').get('content.length'), 0)
-  equal(store.all('project').get('content.length'), 0)
+    equal(store.all('user').get('content.length'), 0)
+    equal(store.all('project').get('content.length'), 0)
 
-  for (model in FactoryGuy.modelDefinitions) {
-    var definition = FactoryGuy.modelDefinitions[model];
-    ok(definition.reset.calledOnce);
-    definition.reset.restore();
-  }
+    for (model in FactoryGuy.modelDefinitions) {
+      var definition = FactoryGuy.modelDefinitions[model];
+      ok(definition.reset.calledOnce);
+      definition.reset.restore();
+    }
+  });
 });
 
 

data/tests/store_test.js

@@ -52,18 +52,20 @@ testFixtureEquality = function(models, json, num){
 }
 
 asyncTest("no root", function() {
-  var userJson = {
-        id: '1',
-        name: 'monkey'
-      };
-
-  store.pushPayload('user', userJson);
-  store.find('user').then(function(users){
-    equal(users.get('length'), 1, 'Expected one user in the data store');
-
-    equal(users.get('firstObject.id'), userJson.id);
-    equal(users.get('firstObject.name'), userJson.name);
-    start();
+  Em.run(function() {
+    var userJson = {
+          id: '1',
+          name: 'monkey'
+        };
+
+    store.pushPayload('user', userJson);
+    store.find('user').then(function(users){
+      equal(users.get('length'), 1, 'Expected one user in the data store');
+
+      equal(users.get('firstObject.id'), userJson.id);
+      equal(users.get('firstObject.name'), userJson.name);
+      start();
+    });
   });
 });
 
@@ -94,86 +96,92 @@ asyncTest("no root replace data", function(){
 });
 
 asyncTest("single root", function() {
-  var userJson = {
-    users: [{ id:'1', name:'monkey' }, { id:'2', name:'banana' }]
-  };
+  Em.run(function() {
+    var userJson = {
+      users: [{ id:'1', name:'monkey' }, { id:'2', name:'banana' }]
+    };
 
-  store.pushPayload(userJson);
-  store.find('user').then(function(users) {
+    store.pushPayload(userJson);
+    store.find('user').then(function(users) {
 
-    testFixtureEquality(users, userJson['users'], 2);
+      testFixtureEquality(users, userJson['users'], 2);
 
-    users.forEach(function(user) {
-      var u = userJson['users'].findBy('id', user.get('id'));
-      equal(user.get('name'), u.name, 'Got unexpected name ' + user.get('name'));
-    });
+      users.forEach(function(user) {
+        var u = userJson['users'].findBy('id', user.get('id'));
+        equal(user.get('name'), u.name, 'Got unexpected name ' + user.get('name'));
+      });
 
-    start();
+      start();
+    });
   });
 });
 
 asyncTest("multiple roots", function() {
-  var json = {
-    companies: [{ id: '1', name: 'Google', projects: ['1', '2'] }],
-    projects: [
-      { id:'1', title: 'Docs', user: '1' },
-      { id:'2', title: 'Gmail' }
-    ],
-    users: [{ id: '1', name: 'monkey', projects: ['1'] }],
-    profiles: [
-      { id: '1', created_at: new Date(), description: 'banana' },
-      { id: '2', created_at: new Date(), description: 'monkey' }
-    ],
-    hats: [
-      { id: '2', type: 'Trilby' }
-    ],
-  };
+  Em.run(function() {
+    var json = {
+      companies: [{ id: '1', name: 'Google', projects: ['1', '2'] }],
+      projects: [
+        { id:'1', title: 'Docs', user: '1' },
+        { id:'2', title: 'Gmail' }
+      ],
+      users: [{ id: '1', name: 'monkey', projects: ['1'] }],
+      profiles: [
+        { id: '1', created_at: new Date(), description: 'banana' },
+        { id: '2', created_at: new Date(), description: 'monkey' }
+      ],
+      hats: [
+        { id: '2', type: 'Trilby' }
+      ],
+    };
 
-  store.pushPayload(json);
-  Ember.RSVP.Promise.all([
-    store.find('company'), store.find('project'),
-    store.find('user'), store.find('profile'), store.find('hat')
-  ]).then(function(data) {
-    var companies = data[0],
-        projects = data[1],
-        users = data[2],
-        profiles = data[3],
-        hats = data[4];
-
-    testFixtureEquality(companies, json['companies'], 1);
-    testFixtureEquality(projects, json['projects'], 2);
-    testFixtureEquality(users, json['users'], 1);
-    testFixtureEquality(profiles, json['profiles'], 2);
-    testFixtureEquality(hats, json['hats'], 1);
-
-    start();
+    store.pushPayload(json);
+    Ember.RSVP.Promise.all([
+      store.find('company'), store.find('project'),
+      store.find('user'), store.find('profile'), store.find('hat')
+    ]).then(function(data) {
+      var companies = data[0],
+          projects = data[1],
+          users = data[2],
+          profiles = data[3],
+          hats = data[4];
+
+      testFixtureEquality(companies, json['companies'], 1);
+      testFixtureEquality(projects, json['projects'], 2);
+      testFixtureEquality(users, json['users'], 1);
+      testFixtureEquality(profiles, json['profiles'], 2);
+      testFixtureEquality(hats, json['hats'], 1);
+
+      start();
+    });
   });
 });
 
 asyncTest("multiple roots with type specified", function() {
-  var json = {
-    companies: [{ id: '1', name: 'Google', projects: ['1', '2'] }],
-    projects: [
-      { id:'1', title: 'Docs', user: '1' },
-      { id:'2', title: 'Gmail' }
-    ],
-    users: [{ id: '1', name: 'monkey', projects: ['1'] }],
-  }
-
-  store.pushPayload('company', json);
-
-  Ember.RSVP.Promise.all([
-    store.find('company'), store.find('project'), store.find('user')
-  ]).then(function(data) {
-    var companies = data[0],
-        projects = data[1],
-        users = data[2];
-
-    testFixtureEquality(companies, json['companies'], 1);
-    testFixtureEquality(projects, json['projects'], 2);
-    testFixtureEquality(users, json['users'], 1);
-
-    start();
+  Em.run(function() {
+    var json = {
+      companies: [{ id: '1', name: 'Google', projects: ['1', '2'] }],
+      projects: [
+        { id:'1', title: 'Docs', user: '1' },
+        { id:'2', title: 'Gmail' }
+      ],
+      users: [{ id: '1', name: 'monkey', projects: ['1'] }],
+    }
+
+    store.pushPayload('company', json);
+
+    Ember.RSVP.Promise.all([
+      store.find('company'), store.find('project'), store.find('user')
+    ]).then(function(data) {
+      var companies = data[0],
+          projects = data[1],
+          users = data[2];
+
+      testFixtureEquality(companies, json['companies'], 1);
+      testFixtureEquality(projects, json['projects'], 2);
+      testFixtureEquality(users, json['users'], 1);
+
+      start();
+    });
   });
 });
 

data/tests/support/models/group.js

@@ -1,7 +1,7 @@
 Group = DS.Model.extend({
   type:    DS.attr('string', {defaultValue: 'Group'}),
   name:    DS.attr('string'),
-  versions: DS.hasMany('group'),
+  versions: DS.hasMany('group', {inverse: null}),
   profiles: DS.hasMany('profile')
 })
 

data/tests/support/test_helper.js

@@ -85,6 +85,8 @@ TestHelper = Ember.Object.createWithMixins(FactoryGuy.testMixin,{
     container.register('transform:object', ObjectTransform);
     container.injection('serializer', 'store', 'store:main');
 
+    Ember.setupForTesting()
+
     env.store = container.lookup('store:main');
     env.adapter = env.store.get('defaultAdapter');
 

data/tests/test_setup.js

@@ -15,7 +15,7 @@ SmallCompany = Company.extend({
 Group = DS.Model.extend({
   type:    DS.attr('string', {defaultValue: 'Group'}),
   name:    DS.attr('string'),
-  versions: DS.hasMany('group'),
+  versions: DS.hasMany('group', {inverse: null}),
   profiles: DS.hasMany('profile')
 })
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-data-factory-guy
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - Daniel Sudol
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-02-20 00:00:00.000000000 Z
 dependencies: []
 description: Easily create Fixtures for Ember Data
 email: