Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(browsers): fix failing tests in Firefox #3386

Closed
wants to merge 1 commit into from
Closed

chore(browsers): fix failing tests in Firefox #3386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions modules/angular2/src/dom/browser_adapter.dart
View file
Open in desktop
Expand Up @@ -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) {
Expand Down
3 changes: 3 additions & 0 deletions modules/angular2/src/dom/browser_adapter.ts
View file
Open in desktop
Expand Up @@ -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; }
Expand Down
1 change: 1 addition & 0 deletions modules/angular2/src/dom/dom_adapter.ts
View file
Open in desktop
Expand Up @@ -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(); }
Expand Down
3 changes: 3 additions & 0 deletions modules/angular2/src/dom/html_adapter.dart
View file
Open in desktop
Expand Up @@ -102,6 +102,9 @@ class Html5LibDomAdapter implements DomAdapter {
preventDefault(evt) {
throw 'not implemented';
}
isPrevented(evt) {
throw 'not implemented';
}
getInnerHTML(el) {
return el.innerHtml;
}
Expand Down
1 change: 1 addition & 0 deletions modules/angular2/src/dom/parse5_adapter.ts
View file
Open in desktop
Expand Up @@ -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 = '';
Expand Down
2 changes: 1 addition & 1 deletion modules/angular2/src/render/dom/view/view.ts
View file
Open in desktop
Expand Up @@ -79,7 +79,7 @@ export class DomView {
allowDefaultBehavior =
this.eventDispatcher.dispatchRenderEvent(elementIndex, eventName, evalLocals);
if (!allowDefaultBehavior) {
event.preventDefault();
DOM.preventDefault(event);
}
}
return allowDefaultBehavior;
Expand Down
12 changes: 6 additions & 6 deletions modules/angular2/test/core/compiler/integration_spec.ts
View file
Open in desktop
Expand Up @@ -899,14 +899,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);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you keep the old checks?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thay are back in.

This raises another problem in Firefox because checked is not updated after a click when the element is not in the real DOM, but this is a more general problem that will be addressed in aother PR.

expect(DOM.isPrevented(dispatchedEvent2)).toBe(false);
expect(DOM.getChecked(rootTC.componentViewChildren[0].nativeElement))
.toBeFalsy();
expect(DOM.getChecked(rootTC.componentViewChildren[1].nativeElement))
Expand Down
2 changes: 1 addition & 1 deletion modules/angular2/test/dom/dom_adapter_spec.ts
View file
Open in desktop
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions modules/angular2/test/render/dom/view/proto_view_merger_integration_spec.ts
View file
Open in desktop
Expand Up @@ -265,8 +265,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();
});
});
Expand Down
6 changes: 2 additions & 4 deletions modules/angular2/test/router/outlet_spec.ts
View file
Open in desktop
Expand Up @@ -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((_) => {
Expand All @@ -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((_) => {
Expand Down