Merge branch 'master' of github.com:danielspaniel/ember-data-factory-guy

addon/factory-guy.js

@@ -5,6 +5,7 @@ import FixtureBuilderFactory from './builder/fixture-builder-factory';
 import RequestManager from './mocks/request-manager';
 import require from 'require';
 import { assign } from '@ember/polyfills';
+import { join } from '@ember/runloop';
 
 let modelDefinitions = {};
 
@@ -380,7 +381,7 @@ class FactoryGuy {
     }
 
     let data  = this.fixtureBuilder(modelName).convertForMake(modelName, fixture),
-        model = Ember.run(() => this.store.push(data));
+        model = join(() => this.store.push(data));
 
     if (definition.hasAfterMake()) {
       definition.applyAfterMake(model, args.opts);
@@ -405,7 +406,7 @@ class FactoryGuy {
 
     delete fixture.id;
 
-    return Ember.run(() => this.store.createRecord(modelName, fixture));
+    return join(() => this.store.createRecord(modelName, fixture));
   }
 
   /**
@@ -452,7 +453,7 @@ class FactoryGuy {
 
   ensureNameInArguments(method, args) {
     Ember.assert(
-      `[ember-data-factory-guy] ${method} needs at least a name 
+      `[ember-data-factory-guy] ${method} needs at least a name
       ( of model or named factory definition )`,
       args.length > 0
     );

addon/index.js

@@ -10,7 +10,8 @@ import FactoryGuy, {
 import {
   mockSetup, mockTeardown,
   mockFind, mockFindRecord, mockFindAll, mockReload, mockQuery,
-  mockQueryRecord, mockCreate, mockUpdate, mockDelete, mock, mockLinks
+  mockQueryRecord, mockCreate, mockUpdate, mockDelete, mock, mockLinks,
+  getPretender
 } from './mocks/exposed-request-functions';
 
 import manualSetup from './utils/manual-setup';
@@ -30,7 +31,8 @@ export { make, makeNew, makeList, build, buildList, attributesFor, manualSetup,
 export {
   mockSetup, mockTeardown,
   mockFind, mockFindRecord, mockFindAll, mockReload, mockQuery,
-  mockQueryRecord, mockCreate, mockUpdate, mockDelete, mock, mockLinks
+  mockQueryRecord, mockCreate, mockUpdate, mockDelete, mock, mockLinks,
+  getPretender
 };
 
 export function setupFactoryGuy(hooks) {

addon/mocks/exposed-request-functions.js

@@ -12,6 +12,7 @@ import MockFindAllRequest from './mock-find-all-request';
 import MockDeleteRequest from './mock-delete-request';
 import MockAnyRequest from './mock-any-request';
 import MockLinksRequest from './mock-links-request';
+import RequestManager from './request-manager';
 
 export function mockSetup({responseTime, logLevel = 0} = {}) {
   Ember.deprecate(`[ember-data-factory-guy] mockSetup is no longer needed. If you want to set logLevel or responseTime, use FactoryGuy.settings instead. If you don't need to set anything, it is safe to remove mockSetup`,
@@ -384,3 +385,10 @@ export function mockDelete(...args) {
 
   return new MockDeleteRequest(modelName, id);
 }
+
+/**
+ Returns the Pretender instance used for the mocks.
+*/
+export function getPretender() {
+  return RequestManager.getPretender();
+}

tests/unit/get-pretenter-test.js

@@ -0,0 +1,22 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+import { mock, manualSetup, getPretender } from 'ember-data-factory-guy';
+import Pretender from 'pretender'
+
+module('Unit | getPretender', function(hooks) {
+  setupTest(hooks);
+
+  hooks.beforeEach(function() {
+    manualSetup(this);
+  });
+
+  test('getPretender basic usage', function(assert) {
+    assert.expect(3);
+    let pretender = getPretender();
+
+    assert.ok(pretender instanceof Pretender, "getPretender returns an instance of Pretender");
+    assert.equal(pretender.handlers.length, 0, "the handlers array is initially empty");
+    mock({url: "/api/whatever"});
+    assert.equal(pretender.handlers.length, 1, "the created mock is added to the handlers");
+  });
+});