Remove guards for supporting older Ember versions

Author: Robert Jackson

addon-test-support/@ember/test-helpers/-internal/render-settled.ts

@@ -15,7 +15,9 @@ if (macroCondition(dependencySatisfies('ember-source', '>=4.5.0-beta.1'))) {
   //@ts-ignore
   renderSettled = importSync('@ember/-internals/glimmer').renderSettled;
 } else {
-  throw new Error('Using an unsupported version of Ember  (@ember/test-helpers@3.0.0+ requires Ember 4 or higher)');
+  throw new Error(
+    'Using an unsupported version of Ember  (@ember/test-helpers@3.0.0+ requires Ember 4 or higher)'
+  );
 }
 
 export default renderSettled;

addon-test-support/@ember/test-helpers/setup-rendering-context.ts

@@ -17,7 +17,10 @@ import { assert } from '@ember/debug';
 import { runHooks } from './-internal/helper-hooks';
 import { ComponentRenderMap, SetUsage } from './setup-context';
 import { ensureSafeComponent } from '@embroider/util';
-import type { ComponentInstance, InternalComponentManager } from '@glimmer/interfaces';
+import type {
+  ComponentInstance,
+  InternalComponentManager,
+} from '@glimmer/interfaces';
 import { getInternalComponentManager } from '@glimmer/manager';
 
 const OUTLET_TEMPLATE = hbs`{{outlet}}`;
@@ -152,8 +155,8 @@ export function render(
         if (setCalls !== undefined) {
           assert(
             `You cannot call \`this.set\` or \`this.setProperties\` when passing a component to \`render\`, but they were called for the following properties:\n${setCalls
-.map((key) => `  - ${key}`)
-.join('\n')}`
+              .map((key) => `  - ${key}`)
+              .join('\n')}`
           );
         }
 

tests/integration/dom/scroll-to-test.js

@@ -7,18 +7,13 @@ import {
   setupRenderingContext,
   teardownContext,
 } from '@ember/test-helpers';
-import hasEmberVersion from '@ember/test-helpers/has-ember-version';
 import {
   buildExpectedSteps,
   registerHooks,
   unregisterHooks,
 } from '../../helpers/register-hooks';
 
 module('DOM Helper: scroll-to', function (hooks) {
-  if (!hasEmberVersion(2, 4)) {
-    return;
-  }
-
   hooks.beforeEach(async function () {
     await setupContext(this);
     await setupRenderingContext(this);

tests/integration/rerender-test.js

@@ -16,13 +16,8 @@ import GlimmerComponent from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { hbs } from 'ember-cli-htmlbars';
 import { module, test } from 'qunit';
-import hasEmberVersion from '@ember/test-helpers/has-ember-version';
 
 module('rerender real-world', function (hooks) {
-  // this test requires Ember 3.25 in order to use lexically scoped values in templates
-  if (!hasEmberVersion(3, 25)) {
-    return;
-  }
   hooks.beforeEach(async function () {
     await setupContext(this);
     await setupRenderingContext(this);

tests/integration/settled-test.js

@@ -12,7 +12,6 @@ import {
   render,
   rerender,
 } from '@ember/test-helpers';
-import hasEmberVersion from '@ember/test-helpers/has-ember-version';
 import { module, test } from 'qunit';
 import { hbs } from 'ember-cli-htmlbars';
 import Pretender from 'pretender';
@@ -119,10 +118,6 @@ const TestComponent5 = Component.extend({
 });
 
 module('settled real-world scenarios', function (hooks) {
-  if (!hasEmberVersion(2, 4)) {
-    return;
-  }
-
   hooks.beforeEach(async function () {
     await setupContext(this);
     await setupRenderingContext(this);

tests/integration/setup-rendering-context-test.js

@@ -15,7 +15,6 @@ import {
 } from '@ember/test-helpers';
 import templateOnly from '@ember/component/template-only';
 
-import hasEmberVersion from '@ember/test-helpers/has-ember-version';
 import { setResolverRegistry } from '../helpers/resolver';
 import { hbs } from 'ember-cli-htmlbars';
 import { precompileTemplate } from '@ember/template-compilation';
@@ -143,60 +142,56 @@ module('setupRenderingContext "real world"', function (hooks) {
   });
 
   module('lexical scope access', function () {
-    if (hasEmberVersion(3, 28)) {
-      test('can render components passed as locals', async function (assert) {
-        let add = helper(function ([first, second]) {
-          return first + second;
-        });
-
-        await render(
-          precompileTemplate('{{add 1 3}}', {
-            scope() {
-              return { add };
-            },
-          })
-        );
-
-        assert.equal(this.element.textContent, '4');
+    test('can render components passed as locals', async function (assert) {
+      let add = helper(function ([first, second]) {
+        return first + second;
       });
-    }
+
+      await render(
+        precompileTemplate('{{add 1 3}}', {
+          scope() {
+            return { add };
+          },
+        })
+      );
+
+      assert.equal(this.element.textContent, '4');
+    });
   });
 
   module('render with a component', function () {
-    if (hasEmberVersion(3, 25)) {
-      test('can render locally defined components', async function (assert) {
-        class MyComponent extends GlimmerComponent {}
+    test('can render locally defined components', async function (assert) {
+      class MyComponent extends GlimmerComponent {}
 
-        setComponentTemplate(hbs`my name is {{@name}}`, MyComponent);
+      setComponentTemplate(hbs`my name is {{@name}}`, MyComponent);
 
-        const somePerson = new (class {
-          @tracked name = 'Zoey';
-        })();
+      const somePerson = new (class {
+        @tracked name = 'Zoey';
+      })();
 
-        const template = precompileTemplate(
-          '<MyComponent @name={{somePerson.name}} />',
-          {
-            scope() {
-              return {
-                somePerson,
-                MyComponent,
-              };
-            },
-          }
-        );
+      const template = precompileTemplate(
+        '<MyComponent @name={{somePerson.name}} />',
+        {
+          scope() {
+            return {
+              somePerson,
+              MyComponent,
+            };
+          },
+        }
+      );
 
-        const component = setComponentTemplate(template, templateOnly());
+      const component = setComponentTemplate(template, templateOnly());
 
-        await render(component);
+      await render(component);
 
-        assert.equal(this.element.textContent, 'my name is Zoey');
+      assert.equal(this.element.textContent, 'my name is Zoey');
 
-        somePerson.name = 'Tomster';
+      somePerson.name = 'Tomster';
 
-        await rerender();
+      await rerender();
 
-        assert.equal(this.element.textContent, 'my name is Tomster');
-      });
-    }
+      assert.equal(this.element.textContent, 'my name is Tomster');
+    });
   });
 });

tests/unit/dom/blur-test.js

@@ -8,7 +8,6 @@ import {
 } from '@ember/test-helpers';
 import { buildInstrumentedElement, insertElement } from '../../helpers/events';
 import { isIE11, isEdge } from '../../helpers/browser-detect';
-import hasEmberVersion from '@ember/test-helpers/has-ember-version';
 
 let focusSteps = ['focus', 'focusin'];
 let blurSteps = ['blur', 'focusout'];
@@ -21,10 +20,6 @@ if (isIE11) {
 }
 
 module('DOM Helper: blur', function (hooks) {
-  if (!hasEmberVersion(2, 4)) {
-    return;
-  }
-
   let context, elementWithFocus;
 
   hooks.beforeEach(async function (assert) {

tests/unit/dom/click-test.js

@@ -6,18 +6,13 @@ import {
   insertElement,
 } from '../../helpers/events';
 import { isIE11 } from '../../helpers/browser-detect';
-import hasEmberVersion from '@ember/test-helpers/has-ember-version';
 import {
   registerHooks,
   unregisterHooks,
   buildExpectedSteps,
 } from '../../helpers/register-hooks';
 
 module('DOM Helper: click', function (hooks) {
-  if (!hasEmberVersion(2, 4)) {
-    return;
-  }
-
   let context, element;
 
   hooks.beforeEach(function () {

tests/unit/dom/double-click-test.js

@@ -10,7 +10,6 @@ import {
   insertElement,
 } from '../../helpers/events';
 import { isIE11 } from '../../helpers/browser-detect';
-import hasEmberVersion from '@ember/test-helpers/has-ember-version';
 import {
   registerHooks,
   unregisterHooks,
@@ -28,10 +27,6 @@ const expectedEvents = [
 ];
 
 module('DOM Helper: doubleClick', function (hooks) {
-  if (!hasEmberVersion(2, 4)) {
-    return;
-  }
-
   let context, element;
 
   hooks.beforeEach(function () {

tests/unit/dom/fill-in-test.js

@@ -2,7 +2,6 @@ import { module, test } from 'qunit';
 import { fillIn, setupContext, teardownContext } from '@ember/test-helpers';
 import { buildInstrumentedElement, insertElement } from '../../helpers/events';
 import { isIE11, isFirefox } from '../../helpers/browser-detect';
-import hasEmberVersion from '@ember/test-helpers/has-ember-version';
 import {
   registerHooks,
   unregisterHooks,
@@ -18,10 +17,6 @@ if (isIE11) {
 }
 
 module('DOM Helper: fillIn', function (hooks) {
-  if (!hasEmberVersion(2, 4)) {
-    return;
-  }
-
   let context, element;
 
   hooks.beforeEach(function () {