Use settled from @ember/test-helpers in the RouterService transitionTo tests

babel.test.config.mjs

@@ -9,12 +9,24 @@
 
 import { createRequire } from 'node:module';
 import baseConfig from './babel.config.mjs';
+import { buildMacros } from '@embroider/macros/babel';
 
 // eslint-disable-next-line no-redeclare
 const require = createRequire(import.meta.url);
 const buildDebugMacroPlugin = require('./broccoli/build-debug-macro-plugin.cjs');
 const isProduction = process.env.EMBER_ENV === 'production';
 
+// @ember/test-helpers and @ember/test-waiters use @embroider/macros.
+//
+// buildMacros() reads NODE_ENV, but our builds select the mode with EMBER_ENV.
+const macros = buildMacros({
+  configure(config) {
+    if (!isProduction) {
+      config.enablePackageDevelopment(process.cwd());
+    }
+  },
+});
+
 export default {
   ...baseConfig,
 
@@ -27,5 +39,5 @@ export default {
     ],
   ],
 
-  plugins: [...baseConfig.plugins, ...buildDebugMacroPlugin(!isProduction)],
+  plugins: [...baseConfig.plugins, ...macros.babelMacros, ...buildDebugMacroPlugin(!isProduction)],
 };

package.json

@@ -106,6 +106,7 @@
     "@babel/plugin-transform-typescript": "^7.26.8",
     "@babel/preset-env": "^7.16.11",
     "@babel/types": "^7.22.5",
+    "@ember/test-helpers": "^5.5.0",
     "@embroider/macros": "^1.20.2",
     "@embroider/shared-internals": "^3.0.2",
     "@embroider/vite": "^1.7.2",

packages/ember/tests/routing/router_service_test/transitionTo_test.js

@@ -3,11 +3,11 @@ import Component from '@glimmer/component';
 import Route from '@ember/routing/route';
 import NoneLocation from '@ember/routing/none-location';
 import Controller from '@ember/controller';
-import { run } from '@ember/runloop';
 import { action, get } from '@ember/object';
 import { precompileTemplate } from '@ember/template-compilation';
 import { setComponentTemplate } from '@glimmer/manager';
 import { RouterTestCase, moduleFor } from 'internal-test-helpers';
+import { settled } from '@ember/test-helpers';
 import { InternalTransition as Transition } from 'router_js';
 
 moduleFor(
@@ -96,7 +96,7 @@ moduleFor(
         });
     }
 
-    ['@test RouterService#transitionTo with basic route'](assert) {
+    async ['@test RouterService#transitionTo with basic route'](assert) {
       assert.expect(1);
 
       let componentInstance;
@@ -122,16 +122,15 @@ moduleFor(
         )
       );
 
-      return this.visit('/').then(() => {
-        run(function () {
-          componentInstance.transitionToSister();
-        });
+      await this.visit('/');
 
-        assert.equal(this.routerService.get('currentRouteName'), 'parent.sister');
-      });
+      componentInstance.transitionToSister();
+      await settled();
+
+      assert.equal(this.routerService.get('currentRouteName'), 'parent.sister');
     }
 
-    ['@test RouterService#transitionTo with basic route using URL'](assert) {
+    async ['@test RouterService#transitionTo with basic route using URL'](assert) {
       assert.expect(1);
 
       let componentInstance;
@@ -157,13 +156,12 @@ moduleFor(
         )
       );
 
-      return this.visit('/').then(() => {
-        run(function () {
-          componentInstance.transitionToSister();
-        });
+      await this.visit('/');
 
-        assert.equal(this.routerService.get('currentRouteName'), 'parent.sister');
-      });
+      componentInstance.transitionToSister();
+      await settled();
+
+      assert.equal(this.routerService.get('currentRouteName'), 'parent.sister');
     }
 
     async ['@test RouterService#transitionTo with dynamic segment'](assert) {
@@ -196,9 +194,8 @@ moduleFor(
 
       await this.visit('/');
 
-      run(function () {
-        componentInstance.transitionToDynamic();
-      });
+      componentInstance.transitionToDynamic();
+      await settled();
 
       assert.equal(this.routerService.get('currentRouteName'), 'dynamic');
       assert.equal(this.routerService.get('currentURL'), '/dynamic/1');
@@ -244,9 +241,8 @@ moduleFor(
 
       await this.visit('/');
 
-      run(function () {
-        componentInstance.transitionToDynamic();
-      });
+      componentInstance.transitionToDynamic();
+      await settled();
 
       assert.equal(this.routerService.get('currentRouteName'), 'dynamic');
       assert.equal(this.routerService.get('currentURL'), '/dynamic/1');

rollup.config.mjs

@@ -16,6 +16,9 @@ const buildDebugMacroPlugin = require('./broccoli/build-debug-macro-plugin.cjs')
 const canaryFeatures = require('./broccoli/canary-features.cjs');
 
 const testDependencies = [
+  '@ember/test-helpers',
+  '@ember/test-waiters',
+  'dom-element-descriptors',
   'qunit',
   'vite',
   'js-reporters',