[BUGFIX] Ensure that delayed transition retrys work

Targeting master branch with same fix as #17328

package.json

@@ -148,7 +148,7 @@
     "puppeteer": "^1.3.0",
     "qunit": "^2.8.0",
     "route-recognizer": "^0.3.4",
-    "router_js": "^6.1.3",
+    "router_js": "^6.2.1",
     "rsvp": "^4.8.4",
     "semver": "^5.5.0",
     "serve-static": "^1.13.2",

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

@@ -2,6 +2,7 @@ import { RouterTestCase, moduleFor } from 'internal-test-helpers';
 import { EMBER_ROUTING_ROUTER_SERVICE } from '@ember/canary-features';
 import { inject as service } from '@ember/service';
 import { Route } from '@ember/-internals/routing';
+import { later } from '@ember/runloop';
 
 if (EMBER_ROUTING_ROUTER_SERVICE) {
   moduleFor(
@@ -99,6 +100,33 @@ if (EMBER_ROUTING_ROUTER_SERVICE) {
         });
       }
 
+      '@test transitions can be retried async'(assert) {
+        let done = assert.async();
+        this.add(
+          `route:parent.child`,
+          Route.extend({
+            actions: {
+              willTransition(transition) {
+                transition.abort();
+                this.intermediateTransitionTo('parent.sister');
+                later(() => {
+                  transition.retry();
+                  done();
+                }, 500);
+              },
+            },
+          })
+        );
+
+        return this.visit('/child')
+          .then(() => {
+            return this.visit('/');
+          })
+          .catch(e => {
+            assert.equal(e.message, 'TransitionAborted');
+          });
+      }
+
       '@test redirection with `transitionTo`'(assert) {
         assert.expect(8);
         let toChild = false;