From 49d4c4ff763fb0e586e15d5c8c7fc0946cc19662 Mon Sep 17 00:00:00 2001 From: Pairing Date: Thu, 7 May 2015 11:54:24 -0400 Subject: [PATCH] Monkey patch factory guy handleFind for STI tasks * Created an issue: https://github.com/danielspaniel/ember-data-factory-guy/issues/82 --- client/tests/addons/add-author-test.js | 11 ----------- client/tests/addons/inviting-an-editor-test.js | 11 ----------- client/tests/helpers/start-app.js | 14 ++++++++++++++ 3 files changed, 14 insertions(+), 22 deletions(-) diff --git a/client/tests/addons/add-author-test.js b/client/tests/addons/add-author-test.js index 5d8bb2da45e..7946624f2c4 100644 --- a/client/tests/addons/add-author-test.js +++ b/client/tests/addons/add-author-test.js @@ -4,17 +4,6 @@ import startApp from "tahi/tests/helpers/start-app"; import FactoryGuy from "ember-data-factory-guy"; import TestHelper from "ember-data-factory-guy/factory-guy-test-helper"; -TestHelper.mapFind = function(modelName, json) { - let responseJson = {}; - if ((/Task/).test(modelName)) { - responseJson["tasks"] = json; - } else { - responseJson[Ember.String.pluralize(modelName)] = json; - } - return responseJson; -}; - - let App, paper, phase, task; module("Integration: adding an author", { diff --git a/client/tests/addons/inviting-an-editor-test.js b/client/tests/addons/inviting-an-editor-test.js index fd569d92a9b..ee4b0e84509 100644 --- a/client/tests/addons/inviting-an-editor-test.js +++ b/client/tests/addons/inviting-an-editor-test.js @@ -4,17 +4,6 @@ import startApp from "tahi/tests/helpers/start-app"; import FactoryGuy from "ember-data-factory-guy"; import TestHelper from "ember-data-factory-guy/factory-guy-test-helper"; - -TestHelper.mapFind = function(modelName, json) { - let responseJson = {}; - if ((/Task/).test(modelName)) { - responseJson["tasks"] = json; - } else { - responseJson[Ember.String.pluralize(modelName)] = json; - } - return responseJson; -}; - let App, paper, phase, task, inviteeEmail; module("Integration: inviting an editor", { diff --git a/client/tests/helpers/start-app.js b/client/tests/helpers/start-app.js index a06fccfdc8a..3476ed87119 100644 --- a/client/tests/helpers/start-app.js +++ b/client/tests/helpers/start-app.js @@ -10,6 +10,7 @@ import chosenHelpers from './chosen-helpers'; import customAssertions from './custom-assertions'; import Factory from './factory'; +import TestHelper from "ember-data-factory-guy/factory-guy-test-helper"; export default function startApp(attrs) { var application; @@ -30,6 +31,19 @@ export default function startApp(attrs) { window.currentUserData = {user: currentUser}; + TestHelper.reopen({ + mapFind: function(modelName, json) { + var responseJson = {}; + // hack to work around + // https://github.com/danielspaniel/ember-data-factory-guy/issues/82 + if ((/Task/).test(modelName)) { + modelName = 'task'; + } + responseJson[Ember.String.pluralize(modelName)] = json; + return responseJson; + } + }); + Ember.run(function() { application = Application.create(attributes); application.setupForTesting();