make model loading test compatible with async loading

Author: sly7-7

packages/ember/tests/routing/model_loading_test.js

@@ -2,7 +2,7 @@
 import { Route } from '@ember/-internals/routing';
 import Controller from '@ember/controller';
 import { Object as EmberObject, A as emberA } from '@ember/-internals/runtime';
-import { moduleFor, ApplicationTestCase, getTextOf } from 'internal-test-helpers';
+import { moduleFor, ApplicationTestCase, getTextOf, runLoopSettled } from 'internal-test-helpers';
 import { run } from '@ember/runloop';
 import { computed, set } from '@ember/-internals/metal';
 import { isDestroying } from '@glimmer/destroyable';
@@ -502,8 +502,6 @@ class LoadingTests extends ApplicationTestCase {
       })
     );
 
-    this.add('route:loading', Route.extend({}));
-    this.add('route:home', Route.extend({}));
     this.add(
       'route:special',
       Route.extend({
@@ -518,7 +516,6 @@ class LoadingTests extends ApplicationTestCase {
 
     this.addTemplate('root.index', '<h3>Home</h3>');
     this.addTemplate('special', '<p>{{@model.id}}</p>');
-    this.addTemplate('loading', '<p>LOADING!</p>');
 
     return this.visit('/').then(() => {
       rootElement = document.getElementById('qunit-fixture');
@@ -755,7 +752,7 @@ class LoadingTests extends ApplicationTestCase {
       });
   }
 
-  ['@test Parent route context change'](assert) {
+  async ['@test Parent route context change'](assert) {
     let editCount = 0;
     let editedPostIds = emberA();
 
@@ -777,8 +774,8 @@ class LoadingTests extends ApplicationTestCase {
       'route:posts',
       Route.extend({
         actions: {
-          showPost(context) {
-            expectDeprecation(() => {
+          async showPost(context) {
+            await expectDeprecationAsync(() => {
               this.transitionTo('post', context);
             }, /Calling transitionTo on a route is deprecated/);
           },
@@ -798,8 +795,8 @@ class LoadingTests extends ApplicationTestCase {
         },
 
         actions: {
-          editPost() {
-            expectDeprecation(() => {
+          async editPost() {
+            await expectDeprecationAsync(() => {
               this.transitionTo('post.edit');
             }, /Calling transitionTo on a route is deprecated/);
           },
@@ -815,22 +812,26 @@ class LoadingTests extends ApplicationTestCase {
           editedPostIds.push(postId);
           return null;
         },
+
         setup() {
           this._super(...arguments);
           editCount++;
         },
       })
     );
 
-    return this.visit('/posts/1').then(() => {
-      assert.ok(true, '/posts/1 has been handled');
-      let router = this.applicationInstance.lookup('router:main');
-      run(() => router.send('editPost'));
-      run(() => router.send('showPost', { id: '2' }));
-      run(() => router.send('editPost'));
-      assert.equal(editCount, 2, 'set up the edit route twice without failure');
-      assert.deepEqual(editedPostIds, ['1', '2'], 'modelFor posts.post returns the right context');
-    });
+    await this.visit('/posts/1');
+    assert.ok(true, '/posts/1 has been handled');
+    let router = this.applicationInstance.lookup('router:main');
+    run(() => router.send('editPost'));
+    await runLoopSettled();
+    await runLoopSettled();
+    run(() => router.send('showPost', { id: '2' }));
+    await runLoopSettled();
+    run(() => router.send('editPost'));
+    await runLoopSettled();
+    assert.equal(editCount, 2, 'set up the edit route twice without failure');
+    assert.deepEqual(editedPostIds, ['1', '2'], 'modelFor posts.post returns the right context');
   }
 
   ['@test ApplicationRoute with model does not proxy the currentPath'](assert) {
@@ -941,6 +942,14 @@ class LoadingTests extends ApplicationTestCase {
         assert.equal(childcount, 2);
       });
   }
+
+  ['@test What about loading states'](assert) {
+    assert.expect(1);
+    this.add('route:loading', Route.extend({}));
+    return this.visit('/').then(() => {
+      assert.ok(true);
+    });
+  }
 }
 
 moduleFor('Route - model loading', LoadingTests);
@@ -968,6 +977,12 @@ moduleFor(
               return routePromises.get(name);
             }
 
+            // if (name.indexOf('loading')) {
+            //   let route = getRoute(name);
+            //   routes.set(name, route);
+            //   return route;
+            // }
+
             let promise = new RSVP.Promise((resolve) => {
               setTimeout(() => {
                 if (isDestroying(this)) {