diff --git a/packages/adapter/blueprints/adapter-test/mocha-rfc-232-files/__root__/__path__/__test__.js b/packages/adapter/blueprints/adapter-test/mocha-rfc-232-files/__root__/__path__/__test__.js index ac8efb6274d..7a6b2171320 100644 --- a/packages/adapter/blueprints/adapter-test/mocha-rfc-232-files/__root__/__path__/__test__.js +++ b/packages/adapter/blueprints/adapter-test/mocha-rfc-232-files/__root__/__path__/__test__.js @@ -1,6 +1,6 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import { setupTest } from 'ember-mocha'; +import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers'; describe('<%= friendlyTestDescription %>', function() { setupTest(); diff --git a/packages/adapter/blueprints/adapter-test/qunit-files/__root__/__path__/__test__.js b/packages/adapter/blueprints/adapter-test/qunit-files/__root__/__path__/__test__.js index 8fc52439de3..96b93a1200a 100644 --- a/packages/adapter/blueprints/adapter-test/qunit-files/__root__/__path__/__test__.js +++ b/packages/adapter/blueprints/adapter-test/qunit-files/__root__/__path__/__test__.js @@ -1,5 +1,5 @@ import { module, test } from 'qunit'; -import { setupTest } from 'ember-qunit'; +import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers'; module('<%= friendlyTestDescription %>', function(hooks) { setupTest(hooks); diff --git a/packages/adapter/node-tests/fixtures/adapter-test/application-default.js b/packages/adapter/node-tests/fixtures/adapter-test/application-default.js index eff23bb9421..392e2698302 100644 --- a/packages/adapter/node-tests/fixtures/adapter-test/application-default.js +++ b/packages/adapter/node-tests/fixtures/adapter-test/application-default.js @@ -1,5 +1,5 @@ import { module, test } from 'qunit'; -import { setupTest } from 'ember-qunit'; +import { setupTest } from 'my-app/tests/helpers'; module('Unit | Adapter | application', function(hooks) { setupTest(hooks); diff --git a/packages/adapter/node-tests/fixtures/adapter-test/foo-default.js b/packages/adapter/node-tests/fixtures/adapter-test/foo-default.js index 61b5526f49e..c1c51095440 100644 --- a/packages/adapter/node-tests/fixtures/adapter-test/foo-default.js +++ b/packages/adapter/node-tests/fixtures/adapter-test/foo-default.js @@ -1,5 +1,5 @@ import { module, test } from 'qunit'; -import { setupTest } from 'ember-qunit'; +import { setupTest } from 'my-app/tests/helpers'; module('Unit | Adapter | foo', function(hooks) { setupTest(hooks); diff --git a/packages/adapter/node-tests/fixtures/adapter-test/mocha-rfc232.js b/packages/adapter/node-tests/fixtures/adapter-test/mocha-rfc232.js index 823755276b3..ead1b53762c 100644 --- a/packages/adapter/node-tests/fixtures/adapter-test/mocha-rfc232.js +++ b/packages/adapter/node-tests/fixtures/adapter-test/mocha-rfc232.js @@ -1,6 +1,6 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import { setupTest } from 'ember-mocha'; +import { setupTest } from 'my-app/tests/helpers'; describe('Unit | Adapter | foo', function() { setupTest(); diff --git a/packages/adapter/node-tests/fixtures/adapter-test/rfc232.js b/packages/adapter/node-tests/fixtures/adapter-test/rfc232.js index 61b5526f49e..c1c51095440 100644 --- a/packages/adapter/node-tests/fixtures/adapter-test/rfc232.js +++ b/packages/adapter/node-tests/fixtures/adapter-test/rfc232.js @@ -1,5 +1,5 @@ import { module, test } from 'qunit'; -import { setupTest } from 'ember-qunit'; +import { setupTest } from 'my-app/tests/helpers'; module('Unit | Adapter | foo', function(hooks) { setupTest(hooks); diff --git a/packages/model/blueprints/model-test/mocha-rfc-232-files/__root__/__path__/__test__.js b/packages/model/blueprints/model-test/mocha-rfc-232-files/__root__/__path__/__test__.js index 77576d6d45f..2ab8fe077c5 100644 --- a/packages/model/blueprints/model-test/mocha-rfc-232-files/__root__/__path__/__test__.js +++ b/packages/model/blueprints/model-test/mocha-rfc-232-files/__root__/__path__/__test__.js @@ -1,6 +1,6 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import { setupTest } from 'ember-mocha'; +import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers'; describe('<%= friendlyTestDescription %>', function() { setupTest(); diff --git a/packages/model/blueprints/model-test/qunit-files/__root__/__path__/__test__.js b/packages/model/blueprints/model-test/qunit-files/__root__/__path__/__test__.js index 17693d66fb7..750aa9e9bb4 100644 --- a/packages/model/blueprints/model-test/qunit-files/__root__/__path__/__test__.js +++ b/packages/model/blueprints/model-test/qunit-files/__root__/__path__/__test__.js @@ -1,5 +1,5 @@ import { module, test } from 'qunit'; -import { setupTest } from 'ember-qunit'; +import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers'; module('<%= friendlyTestDescription %>', function(hooks) { setupTest(hooks); diff --git a/packages/model/node-tests/fixtures/model-test/comment-default.js b/packages/model/node-tests/fixtures/model-test/comment-default.js index a207d46059e..6df2cb87e1d 100644 --- a/packages/model/node-tests/fixtures/model-test/comment-default.js +++ b/packages/model/node-tests/fixtures/model-test/comment-default.js @@ -1,5 +1,5 @@ import { module, test } from 'qunit'; -import { setupTest } from 'ember-qunit'; +import { setupTest } from 'my-app/tests/helpers'; module('Unit | Model | comment', function(hooks) { setupTest(hooks); diff --git a/packages/model/node-tests/fixtures/model-test/foo-default.js b/packages/model/node-tests/fixtures/model-test/foo-default.js index 7d570199909..171d1076281 100644 --- a/packages/model/node-tests/fixtures/model-test/foo-default.js +++ b/packages/model/node-tests/fixtures/model-test/foo-default.js @@ -1,5 +1,5 @@ import { module, test } from 'qunit'; -import { setupTest } from 'ember-qunit'; +import { setupTest } from 'my-app/tests/helpers'; module('Unit | Model | foo', function(hooks) { setupTest(hooks); diff --git a/packages/model/node-tests/fixtures/model-test/mocha-rfc232.js b/packages/model/node-tests/fixtures/model-test/mocha-rfc232.js index 9c94ea35029..553edc4fb8b 100644 --- a/packages/model/node-tests/fixtures/model-test/mocha-rfc232.js +++ b/packages/model/node-tests/fixtures/model-test/mocha-rfc232.js @@ -1,6 +1,6 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import { setupTest } from 'ember-mocha'; +import { setupTest } from 'my-app/tests/helpers'; describe('Unit | Model | foo', function() { setupTest(); diff --git a/packages/model/node-tests/fixtures/model-test/post-default.js b/packages/model/node-tests/fixtures/model-test/post-default.js index ba645efc9ee..c599f486c02 100644 --- a/packages/model/node-tests/fixtures/model-test/post-default.js +++ b/packages/model/node-tests/fixtures/model-test/post-default.js @@ -1,5 +1,5 @@ import { module, test } from 'qunit'; -import { setupTest } from 'ember-qunit'; +import { setupTest } from 'my-app/tests/helpers'; module('Unit | Model | post', function(hooks) { setupTest(hooks); diff --git a/packages/model/node-tests/fixtures/model-test/rfc232.js b/packages/model/node-tests/fixtures/model-test/rfc232.js index 7d570199909..171d1076281 100644 --- a/packages/model/node-tests/fixtures/model-test/rfc232.js +++ b/packages/model/node-tests/fixtures/model-test/rfc232.js @@ -1,5 +1,5 @@ import { module, test } from 'qunit'; -import { setupTest } from 'ember-qunit'; +import { setupTest } from 'my-app/tests/helpers'; module('Unit | Model | foo', function(hooks) { setupTest(hooks); diff --git a/packages/serializer/blueprints/serializer-test/mocha-rfc-232-files/__root__/__path__/__test__.js b/packages/serializer/blueprints/serializer-test/mocha-rfc-232-files/__root__/__path__/__test__.js index fcf277e607e..ee572c68f3e 100644 --- a/packages/serializer/blueprints/serializer-test/mocha-rfc-232-files/__root__/__path__/__test__.js +++ b/packages/serializer/blueprints/serializer-test/mocha-rfc-232-files/__root__/__path__/__test__.js @@ -1,6 +1,6 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import { setupTest } from 'ember-mocha'; +import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers'; describe('<%= friendlyTestDescription %>', function() { setupTest(); diff --git a/packages/serializer/blueprints/serializer-test/qunit-files/__root__/__path__/__test__.js b/packages/serializer/blueprints/serializer-test/qunit-files/__root__/__path__/__test__.js index a1bea0f05ce..0188ffb45be 100644 --- a/packages/serializer/blueprints/serializer-test/qunit-files/__root__/__path__/__test__.js +++ b/packages/serializer/blueprints/serializer-test/qunit-files/__root__/__path__/__test__.js @@ -1,5 +1,5 @@ import { module, test } from 'qunit'; -import { setupTest } from 'ember-qunit'; +import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers'; module('<%= friendlyTestDescription %>', function(hooks) { setupTest(hooks); diff --git a/packages/serializer/blueprints/transform-test/mocha-rfc-232-files/__root__/__path__/__test__.js b/packages/serializer/blueprints/transform-test/mocha-rfc-232-files/__root__/__path__/__test__.js index a7fbabdb805..d90e27a0d5b 100644 --- a/packages/serializer/blueprints/transform-test/mocha-rfc-232-files/__root__/__path__/__test__.js +++ b/packages/serializer/blueprints/transform-test/mocha-rfc-232-files/__root__/__path__/__test__.js @@ -1,6 +1,6 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import { setupTest } from 'ember-mocha'; +import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers'; describe('<%= friendlyTestDescription %>', function() { setupTest(); diff --git a/packages/serializer/blueprints/transform-test/qunit-files/__root__/__path__/__test__.js b/packages/serializer/blueprints/transform-test/qunit-files/__root__/__path__/__test__.js index bace94d06e2..332fc3d746b 100644 --- a/packages/serializer/blueprints/transform-test/qunit-files/__root__/__path__/__test__.js +++ b/packages/serializer/blueprints/transform-test/qunit-files/__root__/__path__/__test__.js @@ -1,5 +1,5 @@ import { module, test } from 'qunit'; -import { setupTest } from 'ember-qunit'; +import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers'; module('<%= friendlyTestDescription %>', function(hooks) { setupTest(hooks); diff --git a/packages/serializer/node-tests/fixtures/serializer-test/application-default.js b/packages/serializer/node-tests/fixtures/serializer-test/application-default.js index d197afe0294..0c580f977cb 100644 --- a/packages/serializer/node-tests/fixtures/serializer-test/application-default.js +++ b/packages/serializer/node-tests/fixtures/serializer-test/application-default.js @@ -1,5 +1,5 @@ import { module, test } from 'qunit'; -import { setupTest } from 'ember-qunit'; +import { setupTest } from 'my-app/tests/helpers'; module('Unit | Serializer | application', function(hooks) { setupTest(hooks); diff --git a/packages/serializer/node-tests/fixtures/serializer-test/foo-default.js b/packages/serializer/node-tests/fixtures/serializer-test/foo-default.js index 34805556175..4895fd7b6d6 100644 --- a/packages/serializer/node-tests/fixtures/serializer-test/foo-default.js +++ b/packages/serializer/node-tests/fixtures/serializer-test/foo-default.js @@ -1,5 +1,5 @@ import { module, test } from 'qunit'; -import { setupTest } from 'ember-qunit'; +import { setupTest } from 'my-app/tests/helpers'; module('Unit | Serializer | foo', function(hooks) { setupTest(hooks); diff --git a/packages/serializer/node-tests/fixtures/serializer-test/mocha-rfc232.js b/packages/serializer/node-tests/fixtures/serializer-test/mocha-rfc232.js index 02a450df483..0da9c0c2a5d 100644 --- a/packages/serializer/node-tests/fixtures/serializer-test/mocha-rfc232.js +++ b/packages/serializer/node-tests/fixtures/serializer-test/mocha-rfc232.js @@ -1,6 +1,6 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import { setupTest } from 'ember-mocha'; +import { setupTest } from 'my-app/tests/helpers'; describe('Unit | Serializer | foo', function() { setupTest(); diff --git a/packages/serializer/node-tests/fixtures/serializer-test/rfc232.js b/packages/serializer/node-tests/fixtures/serializer-test/rfc232.js index 34805556175..4895fd7b6d6 100644 --- a/packages/serializer/node-tests/fixtures/serializer-test/rfc232.js +++ b/packages/serializer/node-tests/fixtures/serializer-test/rfc232.js @@ -1,5 +1,5 @@ import { module, test } from 'qunit'; -import { setupTest } from 'ember-qunit'; +import { setupTest } from 'my-app/tests/helpers'; module('Unit | Serializer | foo', function(hooks) { setupTest(hooks); diff --git a/packages/serializer/node-tests/fixtures/transform-test/default.js b/packages/serializer/node-tests/fixtures/transform-test/default.js index 5d9582c8f86..1127e2544bc 100644 --- a/packages/serializer/node-tests/fixtures/transform-test/default.js +++ b/packages/serializer/node-tests/fixtures/transform-test/default.js @@ -1,5 +1,5 @@ import { module, test } from 'qunit'; -import { setupTest } from 'ember-qunit'; +import { setupTest } from 'my-app/tests/helpers'; module('Unit | Transform | foo', function(hooks) { setupTest(hooks); diff --git a/packages/serializer/node-tests/fixtures/transform-test/mocha-rfc232.js b/packages/serializer/node-tests/fixtures/transform-test/mocha-rfc232.js index 5ad1979debc..95a9cdd2de8 100644 --- a/packages/serializer/node-tests/fixtures/transform-test/mocha-rfc232.js +++ b/packages/serializer/node-tests/fixtures/transform-test/mocha-rfc232.js @@ -1,6 +1,6 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import { setupTest } from 'ember-mocha'; +import { setupTest } from 'my-app/tests/helpers'; describe('Unit | Transform | foo', function() { setupTest(); diff --git a/packages/serializer/node-tests/fixtures/transform-test/rfc232.js b/packages/serializer/node-tests/fixtures/transform-test/rfc232.js index 5d9582c8f86..1127e2544bc 100644 --- a/packages/serializer/node-tests/fixtures/transform-test/rfc232.js +++ b/packages/serializer/node-tests/fixtures/transform-test/rfc232.js @@ -1,5 +1,5 @@ import { module, test } from 'qunit'; -import { setupTest } from 'ember-qunit'; +import { setupTest } from 'my-app/tests/helpers'; module('Unit | Transform | foo', function(hooks) { setupTest(hooks);