Merge pull request #176 from euangoddard/master

Added tests to cover supporting browser default behaviour on links

Author: christopherthielen

src/directives/uiSref.ts

@@ -170,7 +170,7 @@ export class UISref implements OnChanges {
   /** When triggered by a (click) event, this function transitions to the UISref's target state */
   @HostListener("click", ["$event.button", "$event.ctrlKey", "$event.metaKey"])
   go(button: number, ctrlKey: boolean, metaKey: boolean) {
-    if (this._anchorUISref && (this._anchorUISref.openInNewTab() || button !== 0 || ctrlKey || metaKey)) {
+    if (this._anchorUISref && (this._anchorUISref.openInNewTab() || button != 0 || ctrlKey || metaKey)) {
       return;
     }
 

test/testUtils.ts

@@ -1,5 +1,5 @@
 import { forEach, map, omit, pick } from '@uirouter/core';
-import { TestBed } from '@angular/core/testing';
+import { DebugElement } from "@angular/core";
 let stateProps = ["resolve", "resolvePolicy", "data", "template", "templateUrl", "url", "name", "params"];
 
 export function tree2Array(tree, inheritName) {
@@ -58,4 +58,6 @@ export function PromiseResult(promise?) {
   }
 }
 
-
+export function clickOnElement(element: DebugElement, button = 0, metaKey = false, ctrlKey = false) {
+  element.triggerEventHandler('click', {button, metaKey, ctrlKey});
+}

test/uiSref/uiSref.spec.ts

@@ -7,6 +7,7 @@ import { UISref } from '../../src/directives/uiSref';
 import { UIRouter, TargetState, TransitionOptions } from '@uirouter/core';
 import { Subject } from 'rxjs/Subject';
 import { Subscription } from "rxjs/Subscription";
+import { clickOnElement } from "../testUtils";
 
 describe('uiSref', () => {
   @Component({
@@ -104,7 +105,7 @@ describe('uiSref', () => {
 
         describe('when clicked', () => {
           beforeEach(() => {
-            des[0].triggerEventHandler('click', {button: 0, metaKey: false, ctrlKey: false});
+            clickOnElement(des[0]);
           });
 
           it('should ignore the click event', () => {
@@ -121,14 +122,42 @@ describe('uiSref', () => {
 
         describe('when clicked', () => {
           beforeEach(() => {
-            des[0].triggerEventHandler('click', {button: 0, metaKey: false, ctrlKey: false});
+            clickOnElement(des[0]);
           });
 
           it('should navigate to the state', () => {
             expect(uiRouterMock.stateService.go).toHaveBeenCalled();
           });
         });
       });
+
+      describe('opening in a new tab', () => {
+        beforeEach(() => {
+          comp.targetA = '';
+          fixture.detectChanges();
+        });
+
+        it('should fallback to the browser default when the button is not the left', () => {
+          clickOnElement(des[0], 1);
+          expect(uiRouterMock.stateService.go).not.toHaveBeenCalled();
+        });
+
+        it('should fallback to the browser default when the button is not set', () => {
+          clickOnElement(des[0], null);
+          expect(uiRouterMock.stateService.go).not.toHaveBeenCalled();
+        });
+
+        it('should fallback to the browser default when the meta key is pressed', () => {
+          clickOnElement(des[0], 0, true);
+          expect(uiRouterMock.stateService.go).not.toHaveBeenCalled();
+        });
+
+        it('should fallback to the browser default when the ctrl key is pressed', () => {
+          clickOnElement(des[0], 0, false, true);
+          expect(uiRouterMock.stateService.go).not.toHaveBeenCalled();
+        });
+      });
+
     });
 
     describe('when the bound values change', () => {

test/uiSrefStatus/uiSrefStatus.spec.ts

@@ -4,6 +4,7 @@ import { By } from '@angular/platform-browser';
 
 import { SrefStatus, UISrefStatus } from '../../src/directives/uiSrefStatus';
 import { UIRouterModule } from '../../src/uiRouterNgModule';
+import { clickOnElement } from "../testUtils";
 
 describe('uiSrefStatus', () => {
   @Component({
@@ -39,7 +40,7 @@ describe('uiSrefStatus', () => {
   describe('when click on `foo` uiSref', () => {
     beforeEach(async(() => {
       spyOn(component, 'updated');
-      de.triggerEventHandler('click', {button: 0, metaKey: false, ctrlKey: false});
+      clickOnElement(de);
     }));
 
     it('should emit a event with a TargetState pointing to `foo`', () => {