From 168965bce3ccfb1969832c40c65c25832c87f63e Mon Sep 17 00:00:00 2001
From: Edward Faulkner <edward@eaf4.com>
Date: Fri, 30 Jun 2023 21:01:54 -0400
Subject: [PATCH] all typescript app scenarios only run on versions with
 ember-native types

---
 tests/scenarios/router-test.ts         | 25 ++++++++++---------------
 tests/scenarios/scenarios.ts           |  2 +-
 tests/scenarios/typescript-app-test.ts | 25 ++++++++++---------------
 3 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/tests/scenarios/router-test.ts b/tests/scenarios/router-test.ts
index 5bf5057a7..bee2bb913 100644
--- a/tests/scenarios/router-test.ts
+++ b/tests/scenarios/router-test.ts
@@ -226,24 +226,19 @@ let routerApp = tsAppScenarios.map('router', project => {
   });
 });
 
-routerApp
-  // these earlier releases of ember don't offer native types, and we're only
-  // testing under native types, not third-party types.
-  .skip('lts_3_28-router')
-  .skip('lts_4_4-router')
-  .forEachScenario(scenario => {
-    Qmodule(scenario.name, function (hooks) {
-      let app: PreparedApp;
-      hooks.before(async () => {
-        app = await scenario.prepare();
-      });
+routerApp.forEachScenario(scenario => {
+  Qmodule(scenario.name, function (hooks) {
+    let app: PreparedApp;
+    hooks.before(async () => {
+      app = await scenario.prepare();
+    });
 
-      test(`type checks`, async function (assert) {
-        let result = await app.execute('pnpm tsc');
-        assert.equal(result.exitCode, 0, result.output);
-      });
+    test(`type checks`, async function (assert) {
+      let result = await app.execute('pnpm tsc');
+      assert.equal(result.exitCode, 0, result.output);
     });
   });
+});
 
 routerApp.forEachScenario(scenario => {
   Qmodule(scenario.name, function (hooks) {
diff --git a/tests/scenarios/scenarios.ts b/tests/scenarios/scenarios.ts
index 96704b42c..0197f53e9 100644
--- a/tests/scenarios/scenarios.ts
+++ b/tests/scenarios/scenarios.ts
@@ -53,7 +53,7 @@ export const appScenarios = supportMatrix(Scenarios.fromProject(baseApp));
 // we're standardizing on Ember's native types, which become available starting
 // at 4.8. So we're not going to run type tests on older releases that don't
 // support them.
-export const tsAppScenarios = supportMatrix(Scenarios.fromProject(baseTSApp));
+export const tsAppScenarios = supportMatrix(Scenarios.fromProject(baseTSApp)).skip('lts_3_28').skip('lts_4_4');
 
 export const dummyAppScenarios = supportMatrix(Scenarios.fromProject(() => baseAddon('dummy-app')));
 
diff --git a/tests/scenarios/typescript-app-test.ts b/tests/scenarios/typescript-app-test.ts
index 40d22454f..8e5ed57ee 100644
--- a/tests/scenarios/typescript-app-test.ts
+++ b/tests/scenarios/typescript-app-test.ts
@@ -78,21 +78,16 @@ typescriptApp.forEachScenario(scenario => {
   });
 });
 
-typescriptApp
-  // these earlier releases of ember don't offer native types, and we're only
-  // testing under native types, not third-party types.
-  .skip('lts_3_28-typescript-app')
-  .skip('lts_4_4-typescript-app')
-  .forEachScenario(scenario => {
-    Qmodule(scenario.name, function (hooks) {
-      let app: PreparedApp;
-      hooks.before(async () => {
-        app = await scenario.prepare();
-      });
+typescriptApp.forEachScenario(scenario => {
+  Qmodule(scenario.name, function (hooks) {
+    let app: PreparedApp;
+    hooks.before(async () => {
+      app = await scenario.prepare();
+    });
 
-      test(`check types`, async function (assert) {
-        let result = await app.execute(`pnpm tsc`);
-        assert.equal(result.exitCode, 0, result.output);
-      });
+    test(`check types`, async function (assert) {
+      let result = await app.execute(`pnpm tsc`);
+      assert.equal(result.exitCode, 0, result.output);
     });
   });
+});