Merge pull request #186 from scalvert/ember-modules-conversion

Converting imports to use ember modules
mainmatter · Apr 26, 2018 · aa6d953 · aa6d953
2 parents d7487e0 + 3d0a306
commit aa6d953
Show file tree

Hide file tree

Showing 10 changed files with 146 additions and 72 deletions.
diff --git a/addon/index.js b/addon/index.js
@@ -1,6 +1,5 @@
-import Ember from 'ember';
-
-const { isNone, deprecate } = Ember;
+import { isNone } from '@ember/utils';
+import { deprecate } from '@ember/application/deprecations';
 
 const message = `Using the "testSelector" helper function is deprecated as it obfuscates the selectors, making the tests harder to understand.
 Please use the actual attribute selectors instead, e.g. "[data-test-my-element]" instead of "testSelector('my-element')".`;

diff --git a/test-support/helpers/ember-test-selectors.js b/test-support/helpers/ember-test-selectors.js
@@ -1,8 +1,6 @@
-import Ember from 'ember';
+import { deprecate } from '@ember/application/deprecations';
 import testSelector from 'ember-test-selectors';
 
-const { deprecate } = Ember;
-
 let message = 'Importing testSelector() from "<appname>/tests/helpers/ember-test-selectors" is deprecated. ' +
   'Please import testSelector() from "ember-test-selectors" instead.';
 

diff --git a/tests/dummy/app/components/data-test-component.js b/tests/dummy/app/components/data-test-component.js
@@ -1,6 +1,4 @@
-import Ember from 'ember';
-
-const { Component } = Ember;
+import Component from '@ember/component';
 
 export default Component.extend({
   // we're explicitly setting attributeBindings here to test that

diff --git a/tests/dummy/app/components/print-test-attributes.js b/tests/dummy/app/components/print-test-attributes.js
@@ -1,6 +1,4 @@
-import Ember from 'ember';
-
-const { Component } = Ember;
+import Component from '@ember/component';
 
 const component = Component.extend();
 

diff --git a/tests/dummy/app/controllers/bind-test.js b/tests/dummy/app/controllers/bind-test.js
@@ -1,8 +1,6 @@
-import Ember from 'ember';
+import Controller from '@ember/controller';
 import { hasPositionalParams } from 'dummy/version-checks';
 
-const { Controller } = Ember;
-
 export default Controller.extend({
   hasPositionalParams,
 });
diff --git a/tests/helpers/destroy-app.js b/tests/helpers/destroy-app.js
@@ -1,6 +1,4 @@
-import Ember from 'ember';
-
-const { run } = Ember;
+import { run } from '@ember/runloop';
 
 export default function destroyApp(application) {
   run(application, 'destroy');

diff --git a/tests/helpers/module-for-acceptance.js b/tests/helpers/module-for-acceptance.js
@@ -1,10 +1,8 @@
+import { Promise } from 'rsvp';
 import { module } from 'qunit';
-import Ember from 'ember';
 import startApp from '../helpers/start-app';
 import destroyApp from '../helpers/destroy-app';
 
-const { RSVP: { Promise } } = Ember;
-
 export default function(name, options = {}) {
   module(name, {
     beforeEach() {

diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js
@@ -1,9 +1,8 @@
-import Ember from 'ember';
+import { merge } from '@ember/polyfills';
+import { run } from '@ember/runloop';
 import Application from '../../app';
 import config from '../../config/environment';
 
-const { merge, run } = Ember;
-
 export default function startApp(attrs) {
   let application;
 

diff --git a/tests/integration/strip-data-test-attributes-from-components-test.js b/tests/integration/strip-data-test-attributes-from-components-test.js
@@ -2,7 +2,10 @@ import { moduleForComponent, test, skip } from 'ember-qunit';
 import hbs from 'htmlbars-inline-precompile';
 
 import config from 'dummy/config/environment';
-import { hasReliablePositionalParams, hasEmberVersion } from 'dummy/version-checks';
+import {
+  hasReliablePositionalParams,
+  hasEmberVersion
+} from 'dummy/version-checks';
 
 moduleForComponent('print-test-attributes', 'StripTestSelectorsTransform plugin', {
   integration: true