Merge pull request #188 from Turbo87/wat

Adjust import paths for `getContext()` and `setResolver()`
emberjs · Feb 5, 2018 · 7a8a01d · 7a8a01d
2 parents ed578ef + 1e449d5
commit 7a8a01d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/addon-test-support/ember-mocha/index.js b/addon-test-support/ember-mocha/index.js
@@ -3,8 +3,8 @@ import describeComponent from 'ember-mocha/describe-component';
 import describeModel     from 'ember-mocha/describe-model';
 import setupTestFactory  from 'ember-mocha/setup-test-factory';
 import { it }            from 'mocha';
+import { setResolver }   from '@ember/test-helpers';
 import {
-  setResolver,
   TestModule,
   TestModuleForModel,
   TestModuleForComponent,

diff --git a/addon-test-support/ember-mocha/mocha-module.js b/addon-test-support/ember-mocha/mocha-module.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
 import { beforeEach, afterEach, after, describe } from 'mocha';
-import { getContext } from 'ember-test-helpers';
+import { getContext } from '@ember/test-helpers';
 
 export function createModule(Constructor, name, description, callbacks, tests, method) {
   Ember.deprecate(

diff --git a/addon-test-support/ember-mocha/setup-test-factory.js b/addon-test-support/ember-mocha/setup-test-factory.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
 import { before, beforeEach, afterEach, after } from 'mocha';
-import { getContext } from 'ember-test-helpers';
+import { getContext } from '@ember/test-helpers';
 
 export default function(Constructor) {
   return function setupTest(moduleName, options = {}) {