From 8ede4dd096afc83f27e48d28c9317bd81b35a4cb Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Thu, 16 Apr 2020 10:18:05 -0400
Subject: [PATCH] [BUGFIX beta] Unguard render error tests without application
 template wrapper

---
 .../integration/application/rendering-test.js | 26 -------------------
 .../glimmer/tests/integration/mount-test.js   | 14 ----------
 2 files changed, 40 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
index fd80ff34b94..e9e0f2375ce 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
@@ -976,19 +976,6 @@ moduleFor(
     async ['@feature(!EMBER_ROUTING_MODEL_ARG) it emits a useful backtracking re-render assertion message'](
       assert
     ) {
-      // When application-template-wrapper optional feature is set to `false`
-      // (and therefore does not add a wrapping `<div>` for the application
-      // template) throwing during component `constructor`/`init` causes
-      // follow-on errors when the ApplicationInstance instance is destroyed
-      // (when the render roots are being cleared).
-      //
-      // TODO: remove this guard, and fix the associated failures when clearing
-      // on application instance instance destruction
-      if (!ENV._APPLICATION_TEMPLATE_WRAPPER) {
-        assert.expect(0);
-        return;
-      }
-
       this.router.map(function() {
         this.route('routeWithError');
       });
@@ -1040,19 +1027,6 @@ moduleFor(
     async ['@feature(EMBER_ROUTING_MODEL_ARG) it emits a useful backtracking re-render assertion message'](
       assert
     ) {
-      // When application-template-wrapper optional feature is set to `false`
-      // (and therefore does not add a wrapping `<div>` for the application
-      // template) throwing during component `constructor`/`init` causes
-      // follow-on errors when the ApplicationInstance instance is destroyed
-      // (when the render roots are being cleared).
-      //
-      // TODO: remove this guard, and fix the associated failures when clearing
-      // on application instance instance destruction
-      if (!ENV._APPLICATION_TEMPLATE_WRAPPER) {
-        assert.expect(0);
-        return;
-      }
-
       this.router.map(function() {
         this.route('routeWithError');
       });
diff --git a/packages/@ember/-internals/glimmer/tests/integration/mount-test.js b/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
index 1806adbe6a9..7ed2be76fa1 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
@@ -1,4 +1,3 @@
-import { ENV } from '@ember/-internals/environment';
 import {
   moduleFor,
   ApplicationTestCase,
@@ -113,19 +112,6 @@ moduleFor(
     }
 
     async ['@test it emits a useful backtracking re-render assertion message'](assert) {
-      // When application-template-wrapper optional feature is set to `false`
-      // (and therefore does not add a wrapping `<div>` for the application
-      // template) throwing during component `constructor`/`init` causes
-      // follow-on errors when the ApplicationInstance instance is destroyed
-      // (when the render roots are being cleared).
-      //
-      // TODO: remove this guard, and fix the associated failures when clearing
-      // on application instance instance destruction
-      if (!ENV._APPLICATION_TEMPLATE_WRAPPER) {
-        assert.expect(0);
-        return;
-      }
-
       this.router.map(function() {
         this.route('route-with-mount');
       });