Merge pull request #5645 from emberjs/cleanup-project

[CHORE] fix up module imports

addon/-legacy-private/system/store.js

@@ -2,6 +2,8 @@
   @module ember-data
 */
 
+import { registerWaiter, unregisterWaiter } from '@ember/test';
+
 import { A } from '@ember/array';
 import EmberError from '@ember/error';
 import MapWithDefault from './map-with-default';
@@ -270,7 +272,7 @@ Store = Service.extend({
         return shouldTrack !== true || isSettled;
       };
 
-      Ember.Test.registerWaiter(this.__asyncWaiter);
+      registerWaiter(this.__asyncWaiter);
     }
   },
 
@@ -3004,7 +3006,7 @@ Store = Service.extend({
     this.unloadAll();
 
     if (DEBUG) {
-      Ember.Test.unregisterWaiter(this.__asyncWaiter);
+      unregisterWaiter(this.__asyncWaiter);
       let shouldTrack = this.shouldTrackAsyncRequests;
       let tracked = this._trackedAsyncRequests;
       let isSettled = tracked.length === 0;

addon/-private/core.js

@@ -1,3 +1,4 @@
+import Namespace from '@ember/application/namespace';
 import Ember from 'ember';
 import VERSION from 'ember-data/version';
 
@@ -17,7 +18,7 @@ import VERSION from 'ember-data/version';
   @type String
   @static
 */
-const DS = Ember.Namespace.create({
+const DS = Namespace.create({
   VERSION: VERSION,
   name: 'DS',
 });

addon/-private/features.js

@@ -1,5 +1,5 @@
-import Ember from 'ember';
+import { isEnabled } from '@ember/canary-features';
 
-export default function isEnabled() {
-  return Ember.FEATURES.isEnabled(...arguments);
+export default function featureIsEnabled() {
+  return isEnabled(...arguments);
 }

addon/-private/system/backburner.js

@@ -1,3 +1,4 @@
+import { registerWaiter } from '@ember/test';
 import Ember from 'ember';
 import { DEBUG } from '@glimmer/env';
 
@@ -8,7 +9,7 @@ const backburner = new Ember._Backburner([
 ]);
 
 if (DEBUG) {
-  Ember.Test.registerWaiter(() => {
+  registerWaiter(() => {
     return !backburner.currentInstance && !backburner.hasTimers();
   });
 }

addon/-record-data-private/system/store.js

@@ -1,6 +1,8 @@
 /**
   @module ember-data
 */
+import { registerWaiter, unregisterWaiter } from '@ember/test';
+
 import { A } from '@ember/array';
 import EmberError from '@ember/error';
 import MapWithDefault from './map-with-default';
@@ -277,7 +279,7 @@ Store = Service.extend({
         return shouldTrack !== true || isSettled;
       };
 
-      Ember.Test.registerWaiter(this.__asyncWaiter);
+      registerWaiter(this.__asyncWaiter);
     }
   },
 
@@ -3241,7 +3243,7 @@ Store = Service.extend({
     this.unloadAll();
 
     if (DEBUG) {
-      Ember.Test.unregisterWaiter(this.__asyncWaiter);
+      unregisterWaiter(this.__asyncWaiter);
       let shouldTrack = this.shouldTrackAsyncRequests;
       let tracked = this._trackedAsyncRequests;
       let isSettled = tracked.length === 0;

addon/index.js

@@ -1,16 +1,16 @@
+import { VERSION } from '@ember/version';
 import EmberError from '@ember/error';
-import Ember from 'ember';
 
 /**
   Ember Data
   @module ember-data
   @main ember-data
 */
 
-if (Ember.VERSION.match(/^1\.([0-9]|1[0-2])\./)) {
+if (VERSION.match(/^1\.([0-9]|1[0-2])\./)) {
   throw new EmberError(
     'Ember Data requires at least Ember 1.13.0, but you have ' +
-      Ember.VERSION +
+      VERSION +
       '. Please upgrade your version of Ember, then upgrade Ember Data.'
   );
 }

lib/calculate-version.js

@@ -5,8 +5,8 @@ var npmGitInfo = require('npm-git-info');
 
 module.exports = function() {
   var gitPath = path.join(__dirname, '..', '.git');
-  var package = require('../package.json');
-  var packageVersion = package.version;
+  var pkg = require('../package.json');
+  var packageVersion = pkg.version;
   var suffix = '';
 
   var info;
@@ -18,7 +18,7 @@ module.exports = function() {
 
     suffix = '+' + info.sha.slice(0, 10);
   } else {
-    info = npmGitInfo(package);
+    info = npmGitInfo(pkg);
     if (info.isInstalledAsNpmPackage() && !info.hasVersionInRef()) {
       suffix = '+' + info.abbreviatedSha;
     }

tests/helpers/watch-property.js

@@ -1,8 +1,6 @@
-import Ember from 'ember';
+import { removeObserver, addObserver } from '@ember/object/observers';
 import QUnit from 'qunit';
 
-const { addObserver, removeObserver } = Ember;
-
 function makeCounter() {
   let count = 0;
   const counter = Object.create(null);

tests/integration/application-test.js

@@ -1,3 +1,4 @@
+import Namespace from '@ember/application/namespace';
 import Service, { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
 import Application from '@ember/application';
@@ -9,7 +10,6 @@ import { module, test } from 'qunit';
 import DS from 'ember-data';
 
 const Store = DS.Store;
-const Namespace = Ember.Namespace;
 
 let app, App, container;
 
@@ -43,7 +43,6 @@ module('integration/application - Injecting a Custom Store', {
 
   afterEach() {
     run(app, app.destroy);
-    Ember.BOOTED = false;
   },
 });
 
@@ -83,7 +82,6 @@ module('integration/application - Injecting the Default Store', {
 
   afterEach() {
     run(app, 'destroy');
-    Ember.BOOTED = false;
   },
 });
 
@@ -118,7 +116,6 @@ if (Ember.inject && service) {
 
     afterEach() {
       run(app, 'destroy');
-      Ember.BOOTED = false;
     },
   });
 
@@ -139,7 +136,6 @@ module('integration/application - Attaching initializer', {
     if (app) {
       run(app, app.destroy);
     }
-    Ember.BOOTED = false;
   },
 });
 

tests/integration/store/query-test.js

@@ -1,13 +1,12 @@
+import { run } from '@ember/runloop';
 import setupStore from 'dummy/tests/helpers/store';
-import Ember from 'ember';
 import RSVP from 'rsvp';
 
 import { module, test } from 'qunit';
 
 import DS from 'ember-data';
 
 var Person, store, env;
-var run = Ember.run;
 
 module('integration/store/query', {
   beforeEach() {

tests/unit/model-test.js

@@ -672,7 +672,7 @@ test('supports canonical updates via pushedData in root.deleted.saved', function
 
   adapter.shouldBackgroundReloadRecord = () => false;
   adapter.deleteRecord = () => {
-    return Ember.RSVP.resolve();
+    return resolve();
   };
 
   let record = run(() =>
@@ -733,7 +733,7 @@ test('Does not support dirtying in root.deleted.saved', function(assert) {
 
   adapter.shouldBackgroundReloadRecord = () => false;
   adapter.deleteRecord = () => {
-    return Ember.RSVP.resolve();
+    return resolve();
   };
 
   let record = run(() =>
@@ -1640,8 +1640,8 @@ test('ID mutation (complicated)', function(assert) {
   let idChange = 0;
   const Person = DS.Model.extend({
     name: DS.attr('string'),
-    idComputed: Ember.computed('id', function() {}),
-    idDidChange: Ember.observer('id', () => idChange++),
+    idComputed: computed('id', function() {}),
+    idDidChange: observer('id', () => idChange++),
   });
 
   let { store } = setupStore({

tests/unit/store/peek-record-test.js

@@ -1,6 +1,6 @@
+import EmberObject from '@ember/object';
 import { run } from '@ember/runloop';
 import setupStore from 'dummy/tests/helpers/store';
-import Ember from 'ember';
 import testInDebug from 'dummy/tests/helpers/test-in-debug';
 
 import { module, test } from 'qunit';
@@ -64,7 +64,7 @@ testInDebug('peekRecord should assert if passed a model class instead of model n
 ) {
   run(() => {
     assert.expectAssertion(() => {
-      let modelClass = Ember.Object.extend();
+      let modelClass = EmberObject.extend();
       store.peekRecord(modelClass, 'id');
     }, /Passing classes to store methods has been removed/);
   });