Apply fixes from @jelhan

Context emberjs#16838 (comment)
knownasilya · Jul 24, 2018 · b03abf1 · b03abf1
1 parent 69b2ba1
commit b03abf1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 16 deletions.
diff --git a/packages/ember-routing/lib/system/router.js b/packages/ember-routing/lib/system/router.js
@@ -148,27 +148,25 @@ const EmberRouter = EmberObject.extend(Evented, {
 
   /**
     Tell us if the router is currently loading.
-    
-    @method _isLoading
-    @return {Boolean} The loading state
+    @property _isLoading
+    @type {Boolean}
     @private
   */
-  get _isLoading() {
+  _isLoading: computed(function() {
     return !!this._activeTransition;
-  },
+  }).volatile(),
 
   /**
     The active transition
-  
-    @method _activeTransition
-    @return {Transition} Return router's active Transition object
+    @property _activeTransition
+    @type {Transition}
     @private
   */
-  get _activeTransition() {
+  _activeTransition: computed(function() {
     if (this._routerMicrolib) {
       return this._routerMicrolib.activeTransition;
     }
-  },
+  }).volatile(),
 
   _hasModuleBasedResolver() {
     let owner = getOwner(this);

diff --git a/packages/ember-routing/tests/system/route_test.js b/packages/ember-routing/tests/system/route_test.js
@@ -424,12 +424,11 @@ moduleFor(
       let postsModel = { id: '2' };
 
       let router = {
-        _routerMicrolib: {
-          activeTransition: {
-            resolvedModels: {
-              'foo.bar': applicationModel,
-              'foo.bar.posts': postsModel,
-            },
+        _isSetup: true,
+        _activeTransition: {
+          resolvedModels: {
+            'foo.bar': applicationModel,
+            'foo.bar.posts': postsModel,
           },
         },
       };