Skip to content

Commit ea03a82

Browse files
committed
do not handle is testing
1 parent 528d7b6 commit ea03a82

File tree

2 files changed

+3
-17
lines changed

2 files changed

+3
-17
lines changed

ember_debug/main.js

+3-8
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,7 @@ class EmberDebug extends BaseObject {
4040
* @type {String}
4141
*/
4242
get applicationId() {
43-
if (!this.isTesting) {
44-
return guidFor(this._application, 'ember');
45-
}
46-
return guidFor(this.owner, 'ember');
43+
return guidFor(this._application, 'ember');
4744
}
4845

4946
// Using object shorthand syntax here is somehow having strange side effects.
@@ -56,7 +53,7 @@ class EmberDebug extends BaseObject {
5653
this.reset($keepAdapter);
5754
return;
5855
}
59-
if (!this._application && !this.isTesting) {
56+
if (!this._application) {
6057
this._application = getApplication();
6158
}
6259
this.started = true;
@@ -104,9 +101,7 @@ class EmberDebug extends BaseObject {
104101

105102
reset($keepAdapter) {
106103
setGuidPrefix(Math.random().toString());
107-
if (!this.isTesting && !this.owner) {
108-
this.owner = getOwner(this._application);
109-
}
104+
this.owner = getOwner(this._application);
110105
this.destroyContainer();
111106
run(() => {
112107
// Adapters don't have state depending on the application itself.

tests/helpers/setup-ember-debug-test.js

-9
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,6 @@ export default function setupEmberDebugTest(hooks, options = {}) {
5050
this.owner.register('router:main', Router);
5151
this.owner.register('service:adapter', BasicAdapter);
5252

53-
run(() => {
54-
EmberDebug.isTesting = true;
55-
EmberDebug.owner = this.owner;
56-
});
57-
5853
EmberDebug.Port =
5954
options.Port ||
6055
class extends Port {
@@ -73,10 +68,6 @@ export default function setupEmberDebugTest(hooks, options = {}) {
7368

7469
EmberDebug.IGNORE_DEPRECATIONS = originalIgnoreDeprecations;
7570

76-
run(() => {
77-
EmberDebug.isTesting = false;
78-
});
79-
8071
EmberDebug.Port = originalPort;
8172

8273
setApplication(originalApp);

0 commit comments

Comments
 (0)