chore(browsers): fix failing tests in Firefox

marclaval · marclaval · commit 88224608588f · 2015-08-03T12:17:44.000+02:00
Closes angular#3386
diff --git a/modules/angular2/src/dom/browser_adapter.dart b/modules/angular2/src/dom/browser_adapter.dart
@@ -188,6 +188,9 @@ class BrowserDomAdapter extends GenericBrowserDomAdapter {
   void preventDefault(Event evt) {
     evt.preventDefault();
   }
+  bool isPrevented(Event evt) {
+    return evt.defaultPrevented;
+  }
   String getInnerHTML(Element el) => el.innerHtml;
   String getOuterHTML(Element el) => el.outerHtml;
   void setInnerHTML(Element el, String value) {
diff --git a/modules/angular2/src/dom/browser_adapter.ts b/modules/angular2/src/dom/browser_adapter.ts
@@ -104,6 +104,9 @@ export class BrowserDomAdapter extends GenericBrowserDomAdapter {
     evt.preventDefault();
     evt.returnValue = false;
   }
+  isPrevented(evt: Event): boolean {
+    return evt.defaultPrevented || isPresent(evt.returnValue) && !evt.returnValue;
+  }
   getInnerHTML(el): string { return el.innerHTML; }
   getOuterHTML(el): string { return el.outerHTML; }
   nodeName(node: Node): string { return node.nodeName; }
diff --git a/modules/angular2/src/dom/dom_adapter.ts b/modules/angular2/src/dom/dom_adapter.ts
@@ -43,6 +43,7 @@ export class DomAdapter {
   createMouseEvent(eventType): any { throw _abstract(); }
   createEvent(eventType: string): any { throw _abstract(); }
   preventDefault(evt) { throw _abstract(); }
+  isPrevented(evt): boolean { throw _abstract(); }
   getInnerHTML(el): string { throw _abstract(); }
   getOuterHTML(el): string { throw _abstract(); }
   nodeName(node): string { throw _abstract(); }
diff --git a/modules/angular2/src/dom/html_adapter.dart b/modules/angular2/src/dom/html_adapter.dart
@@ -102,6 +102,9 @@ class Html5LibDomAdapter implements DomAdapter {
   preventDefault(evt) {
     throw 'not implemented';
   }
+  isPrevented(evt) {
+    throw 'not implemented';
+  }
   getInnerHTML(el) {
     return el.innerHtml;
   }
diff --git a/modules/angular2/src/dom/parse5_adapter.ts b/modules/angular2/src/dom/parse5_adapter.ts
@@ -154,6 +154,7 @@ export class Parse5DomAdapter extends DomAdapter {
     return evt;
   }
   preventDefault(evt) { evt.returnValue = false; }
+  isPrevented(evt): boolean { return isPresent(evt.returnValue) && !evt.returnValue; }
   getInnerHTML(el): string { return serializer.serialize(this.templateAwareRoot(el)); }
   getOuterHTML(el): string {
     serializer.html = '';
diff --git a/modules/angular2/src/render/dom/view/view.ts b/modules/angular2/src/render/dom/view/view.ts
@@ -79,7 +79,7 @@ export class DomView {
       allowDefaultBehavior =
           this.eventDispatcher.dispatchRenderEvent(elementIndex, eventName, evalLocals);
       if (!allowDefaultBehavior) {
-        event.preventDefault();
+        DOM.preventDefault(event);
       }
     }
     return allowDefaultBehavior;
diff --git a/modules/angular2/test/core/compiler/integration_spec.ts b/modules/angular2/test/core/compiler/integration_spec.ts
@@ -900,14 +900,14 @@ export function main() {
 
                  .createAsync(MyComp)
                  .then((rootTC) => {
-                   expect(DOM.getChecked(rootTC.componentViewChildren[0].nativeElement))
-                       .toBeFalsy();
-                   expect(DOM.getChecked(rootTC.componentViewChildren[1].nativeElement))
-                       .toBeFalsy();
+                   var dispatchedEvent = DOM.createMouseEvent('click');
+                   var dispatchedEvent2 = DOM.createMouseEvent('click');
                    DOM.dispatchEvent(rootTC.componentViewChildren[0].nativeElement,
-                                     DOM.createMouseEvent('click'));
+                                     dispatchedEvent);
                    DOM.dispatchEvent(rootTC.componentViewChildren[1].nativeElement,
-                                     DOM.createMouseEvent('click'));
+                                     dispatchedEvent2);
+                   expect(DOM.isPrevented(dispatchedEvent)).toBe(true);
+                   expect(DOM.isPrevented(dispatchedEvent2)).toBe(false);
                    expect(DOM.getChecked(rootTC.componentViewChildren[0].nativeElement))
                        .toBeFalsy();
                    expect(DOM.getChecked(rootTC.componentViewChildren[1].nativeElement))
diff --git a/modules/angular2/test/dom/dom_adapter_spec.ts b/modules/angular2/test/dom/dom_adapter_spec.ts
@@ -34,7 +34,7 @@ export function main() {
 
       expect(clone).not.toBe(el1);
       DOM.setAttribute(clone, 'test', '1');
-      expect(DOM.getOuterHTML(clone)).toEqual('<div x="y" test="1">a<span>b</span></div>');
+      expect(stringifyElement(clone)).toEqual('<div test="1" x="y">a<span>b</span></div>');
       expect(DOM.getAttribute(el1, 'test')).toBeFalsy();
 
       var cNodes = DOM.childNodes(clone);
diff --git a/modules/angular2/test/render/dom/view/proto_view_merger_integration_spec.ts b/modules/angular2/test/render/dom/view/proto_view_merger_integration_spec.ts
@@ -267,8 +267,8 @@ export function main() {
                  tb.merge([rootProtoViewDto, componentProtoViewDto])
                      .then(mergeMappings => {
                        var domPv = resolveInternalDomProtoView(mergeMappings.mergedProtoViewRef);
-                       expect(DOM.getInnerHTML(templateRoot(domPv)))
-                           .toEqual('<root class="ng-binding" a="b"></root>');
+                       expect(stringifyElement(templateRoot(domPv)))
+                           .toEqual('<template><root a="b" class="ng-binding"></root></template>');
                        async.done();
                      });
                });
diff --git a/modules/angular2/test/router/outlet_spec.ts b/modules/angular2/test/router/outlet_spec.ts
@@ -541,8 +541,7 @@ export function main() {
                  rootTC.detectChanges();
 
                  var dispatchedEvent = clickOnElement(rootTC);
-                 expect(dispatchedEvent.defaultPrevented || !dispatchedEvent.returnValue)
-                     .toBe(true);
+                 expect(DOM.isPrevented(dispatchedEvent)).toBe(true);
 
                  // router navigation is async.
                  rtr.subscribe((_) => {
@@ -563,8 +562,7 @@ export function main() {
                  rootTC.detectChanges();
 
                  var dispatchedEvent = clickOnElement(rootTC);
-                 expect(dispatchedEvent.defaultPrevented || !dispatchedEvent.returnValue)
-                     .toBe(true);
+                 expect(DOM.isPrevented(dispatchedEvent)).toBe(true);
 
                  // router navigation is async.
                  rtr.subscribe((_) => {

Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,9 @@ class Html5LibDomAdapter implements DomAdapter {`
`102`	`102`	`preventDefault(evt) {`
`103`	`103`	`throw 'not implemented';`
`104`	`104`	`}`
	`105`	`+ isPrevented(evt) {`
	`106`	`+ throw 'not implemented';`
	`107`	`+ }`
`105`	`108`	`getInnerHTML(el) {`
`106`	`109`	`return el.innerHtml;`
`107`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -154,6 +154,7 @@ export class Parse5DomAdapter extends DomAdapter {`
`154`	`154`	`return evt;`
`155`	`155`	`}`
`156`	`156`	`preventDefault(evt) { evt.returnValue = false; }`
	`157`	`+ isPrevented(evt): boolean { return isPresent(evt.returnValue) && !evt.returnValue; }`
`157`	`158`	`getInnerHTML(el): string { return serializer.serialize(this.templateAwareRoot(el)); }`
`158`	`159`	`getOuterHTML(el): string {`
`159`	`160`	`serializer.html = '';`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ export class DomView {`
`79`	`79`	`allowDefaultBehavior =`
`80`	`80`	`this.eventDispatcher.dispatchRenderEvent(elementIndex, eventName, evalLocals);`
`81`	`81`	`if (!allowDefaultBehavior) {`
`82`		`- event.preventDefault();`
	`82`	`+ DOM.preventDefault(event);`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`	`return allowDefaultBehavior;`