feat(router): Added method to get current instruction

This method delegates to the root router to get the current complete instruction.
brandonroberts · Feb 20, 2016 · c1d499d · c1d499d
1 parent e7470d5
commit c1d499d
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 0 deletions.
diff --git a/modules/angular1_router/test/integration/router_spec.js b/modules/angular1_router/test/integration/router_spec.js
@@ -95,6 +95,26 @@ describe('router', function () {
     expect(elt.text()).toBe('Home (true)');
   }));
 
+  it('should provide the complete current instruction', inject(function($location, $q, $router) {
+    registerDirective('homeCmp', {
+      template: 'Home ({{homeCmp.isAdmin}})'
+    });
+
+    registerDirective('app', {
+      template: '<div ng-outlet></div>',
+      $routeConfig: [
+        { path: '/', component: 'homeCmp', name: 'Home' }
+      ]
+    });
+
+    compile('<app></app>');
+
+    $location.path('/');
+    $rootScope.$digest();
+    var instruction = $router.generate(['/Home']);
+    expect($router.currentInstruction()).toEqual(instruction);
+  }));
+
   function registerDirective(name, options) {
     function factory() {
       return {

diff --git a/modules/angular2/src/router/router.ts b/modules/angular2/src/router/router.ts
@@ -413,6 +413,12 @@ export class Router {
     var ancestorInstructions = this._getAncestorInstructions();
     return this.registry.generate(linkParams, ancestorInstructions);
   }
+
+
+  /**
+   * Returns the current `Instruction`
+   */
+  currentInstruction(): Instruction { return this._currentInstruction; }
 }
 
 @Injectable()
@@ -500,6 +506,11 @@ class ChildRouter extends Router {
     // Delegate navigation to the root router
     return this.parent.navigateByInstruction(instruction, _skipLocationChange);
   }
+
+  currentInstruction(): Instruction {
+    // Delegate current instruction to the root router
+    return this.parent.currentInstruction();
+  }
 }
 
 

diff --git a/modules/angular2/test/router/router_spec.ts b/modules/angular2/test/router/router_spec.ts
@@ -210,6 +210,23 @@ export function main() {
              });
        }));
 
+    it('should provide the complete current instruction', inject([AsyncTestCompleter], (async) => {
+         var outlet = makeDummyOutlet();
+
+         router.registerPrimaryOutlet(outlet)
+             .then((_) => router.config([
+               new Route({path: '/a', component: DummyComponent, name: 'A'}),
+               new Route({path: '/b', component: DummyComponent, name: 'B'})
+             ]))
+             .then((_) => router.navigateByUrl('/a'))
+             .then((_) => {
+               var instruction = router.generate(['/A']);
+
+               expect(router.currentInstruction()).toEqual(instruction);
+               async.done();
+             });
+       }));
+
     describe('query string params', () => {
       it('should use query string params for the root route', () => {
         router.config(