Merge pull request #1188 from emberjs/nvp/fix-barrel-deprecation

Resolve ember barrel deprecations

Author: NullVoxPopuli

addon/src/index.js

@@ -1,5 +1,7 @@
 /* globals Testem */
 import { macroCondition, getOwnConfig, importSync } from '@embroider/macros';
+import { setTesting } from '@ember/debug';
+import { setAdapter } from 'ember-testing/lib/test/adapter';
 
 /**
  * Load qunit-default theme by default, if no custom theme is specified.
@@ -32,7 +34,6 @@ if (typeof Testem !== 'undefined') {
 
 import { _backburner } from '@ember/runloop';
 import { resetOnerror, getTestMetadata } from '@ember/test-helpers';
-import Ember from 'ember';
 import * as QUnit from 'qunit';
 import QUnitAdapter from './adapter';
 import {
@@ -127,7 +128,7 @@ export function startTests() {
    @method setupTestAdapter
  */
 export function setupTestAdapter() {
-  Ember.Test.adapter = QUnitAdapter.create();
+  setAdapter(QUnitAdapter.create());
 }
 
 /**
@@ -138,13 +139,11 @@ export function setupTestAdapter() {
  */
 export function setupEmberTesting() {
   QUnit.testStart(() => {
-    // eslint-disable-next-line ember/no-ember-testing-in-module-scope
-    Ember.testing = true;
+    setTesting(true);
   });
 
   QUnit.testDone(() => {
-    // eslint-disable-next-line ember/no-ember-testing-in-module-scope
-    Ember.testing = false;
+    setTesting(false);
   });
 }
 

test-app/tests/unit/ember-testing-test.js

@@ -1,8 +1,8 @@
-import Ember from 'ember';
+import { isTesting } from '@ember/debug';
 import { module, test } from 'qunit';
 
 module('setupEmberTesting', function () {
-  test('Ember.testing is true in all test contexts', function (assert) {
-    assert.true(Ember.testing);
+  test('isTesting() is true in all test contexts', function (assert) {
+    assert.true(isTesting());
   });
 });

test-app/tests/unit/setup-ember-onerror-validation-test.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
 import { module } from 'qunit';
 import { setupEmberOnerrorValidation } from 'ember-qunit';
+import { getOnerror, setOnerror } from '@ember/-internals/error-handling';
 
 module('setupEmberOnerrorValidation', function (hooks) {
   hooks.beforeEach(function (assert) {
@@ -12,14 +12,14 @@ module('setupEmberOnerrorValidation', function (hooks) {
       originalPushResult(resultInfo);
     };
 
-    this.originalEmberOnerror = Ember.onerror;
-    Ember.onerror = function () {
+    this.originalEmberOnerror = getOnerror();
+    setOnerror(function () {
       // intentionally swallowing here
-    };
+    });
   });
 
   hooks.afterEach(function () {
-    Ember.onerror = this.originalEmberOnerror;
+    setOnerror(this.originalEmberOnerror);
   });
 
   setupEmberOnerrorValidation();