honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore(browsers): fix failing tests in IE11 

Closes #3388
This commit is contained in:
Marc Laval 2015-07-29 18:34:02 +02:00
parent 39ad50657e
commit 166688348a
6 changed files with 54 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/angular2/src/dom/browser_adapter.ts
View File

@ -121,7 +121,7 @@ export class BrowserDomAdapter extends GenericBrowserDomAdapter {
} }
firstChild(el): Node { return el.firstChild; } firstChild(el): Node { return el.firstChild; }
nextSibling(el): Node { return el.nextSibling; } nextSibling(el): Node { return el.nextSibling; }
parentElement(el): Node { return el.parentElement; } parentElement(el): Node { return el.parentNode; }
childNodes(el): List<Node> { return el.childNodes; } childNodes(el): List<Node> { return el.childNodes; }
childNodesAsList(el): List<any> { childNodesAsList(el): List<any> {
var childNodes = el.childNodes; var childNodes = el.childNodes;

2
modules/angular2/src/test_lib/utils.ts
View File

@ -35,7 +35,7 @@ export function containsRegexp(input: string): RegExp {
export function normalizeCSS(css: string): string { export function normalizeCSS(css: string): string {
css = StringWrapper.replaceAll(css, /\s+/g, ' '); css = StringWrapper.replaceAll(css, /\s+/g, ' ');
css = StringWrapper.replaceAll(css, /:\s/g, ':'); css = StringWrapper.replaceAll(css, /:\s/g, ':');
css = StringWrapper.replaceAll(css, /'"/g, '"'); css = StringWrapper.replaceAll(css, /'/g, '"');
css = StringWrapper.replaceAllMapped(css, /url\(\"(.+)\\"\)/g, (match) => `url(${match[1]})`); css = StringWrapper.replaceAllMapped(css, /url\(\"(.+)\\"\)/g, (match) => `url(${match[1]})`);
css = StringWrapper.replaceAllMapped(css, /\[(.+)=([^"\]]+)\]/g, css = StringWrapper.replaceAllMapped(css, /\[(.+)=([^"\]]+)\]/g,
(match) => `[${match[1]}="${match[2]}"]`); (match) => `[${match[1]}="${match[2]}"]`);

36
modules/angular2/test/core/zone/ng_zone_spec.ts
View File

@ -182,7 +182,7 @@ function commonTests() {
macroTask(() => { macroTask(() => {
expect(_log.result()).toEqual('run; onTurnDone 1; onTurnDone 2; onEventDone'); expect(_log.result()).toEqual('run; onTurnDone 1; onTurnDone 2; onEventDone');
async.done(); async.done();
}); }, 80);
})); }));
it('should not allow onEventDone to cause further digests', it('should not allow onEventDone to cause further digests',
@ -206,7 +206,7 @@ function commonTests() {
macroTask(() => { macroTask(() => {
expect(_log.result()).toEqual('run; onTurnDone; onEventDone'); expect(_log.result()).toEqual('run; onTurnDone; onEventDone');
async.done(); async.done();
}); }, 80);
})); }));
it('should run async tasks scheduled inside onEventDone outside Angular zone', it('should run async tasks scheduled inside onEventDone outside Angular zone',
@ -247,7 +247,7 @@ function commonTests() {
// The microtask (async) is executed after the macrotask (run) // The microtask (async) is executed after the macrotask (run)
expect(_log.result()).toEqual('onTurnStart; run start; run end; async; onTurnDone'); expect(_log.result()).toEqual('onTurnStart; run start; run end; async; onTurnDone');
async.done(); async.done();
}, 50); }, 80);
})); }));
it('should not run onTurnStart and onTurnDone for nested Zone.run', it('should not run onTurnStart and onTurnDone for nested Zone.run',
@ -268,7 +268,7 @@ function commonTests() {
.toEqual( .toEqual(
'onTurnStart; start run; nested run; end run; nested run microtask; onTurnDone'); 'onTurnStart; start run; nested run; end run; nested run microtask; onTurnDone');
async.done(); async.done();
}, 50); }, 80);
})); }));
it('should not run onTurnStart and onTurnDone for nested Zone.run invoked from onTurnDone', it('should not run onTurnStart and onTurnDone for nested Zone.run invoked from onTurnDone',
@ -286,7 +286,7 @@ function commonTests() {
expect(_log.result()) expect(_log.result())
.toEqual('start run; onTurnDone:started; nested run; onTurnDone:finished'); .toEqual('start run; onTurnDone:started; nested run; onTurnDone:finished');
async.done(); async.done();
}, 50); }, 80);
})); }));
it('should call onTurnStart and onTurnDone before and after each top-level run', it('should call onTurnStart and onTurnDone before and after each top-level run',
@ -330,7 +330,7 @@ function commonTests() {
.toEqual( .toEqual(
'onTurnStart; run start; onTurnDone; onTurnStart; a then; b then; onTurnDone'); 'onTurnStart; run start; onTurnDone; onTurnStart; a then; b then; onTurnDone');
async.done(); async.done();
}, 50); }, 80);
})); }));
it('should run a function outside of the angular zone', it('should run a function outside of the angular zone',
@ -370,7 +370,7 @@ function commonTests() {
// Third VM Turn => execute the microtask (inside angular) // Third VM Turn => execute the microtask (inside angular)
'onTurnStart; executedMicrotask; onTurnDone'); 'onTurnStart; executedMicrotask; onTurnDone');
async.done(); async.done();
}, 50); }, 80);
})); }));
it('should call onTurnStart before executing a microtask scheduled in onTurnDone as well as ' + it('should call onTurnStart before executing a microtask scheduled in onTurnDone as well as ' +
@ -400,7 +400,7 @@ function commonTests() {
// Second VM Turn => microtask enqueued from onTurnDone // Second VM Turn => microtask enqueued from onTurnDone
'onTurnStart; executedMicrotask; onTurnDone(begin); onTurnDone(end)'); 'onTurnStart; executedMicrotask; onTurnDone(begin); onTurnDone(end)');
async.done(); async.done();
}, 50); }, 80);
})); }));
it('should call onTurnStart and onTurnDone for a scheduleMicrotask in onTurnDone triggered by ' + it('should call onTurnStart and onTurnDone for a scheduleMicrotask in onTurnDone triggered by ' +
@ -435,7 +435,7 @@ function commonTests() {
// Second VM Turn => the microtask enqueued from onTurnDone // Second VM Turn => the microtask enqueued from onTurnDone
'onTurnStart; onTurnDone(executeMicrotask); onTurnDone(begin); onTurnDone(end)'); 'onTurnStart; onTurnDone(executeMicrotask); onTurnDone(begin); onTurnDone(end)');
async.done(); async.done();
}, 50); }, 80);
})); }));
it('should execute promises scheduled in onTurnStart before promises scheduled in run', it('should execute promises scheduled in onTurnStart before promises scheduled in run',
@ -490,7 +490,7 @@ function commonTests() {
// Second VM turn: execute the microtask from onTurnEnd // Second VM turn: execute the microtask from onTurnEnd
'onTurnStart(begin); onTurnStart(end); onTurnDone(executePromise); onTurnDone(begin); onTurnDone(end)'); 'onTurnStart(begin); onTurnStart(end); onTurnDone(executePromise); onTurnDone(begin); onTurnDone(end)');
async.done(); async.done();
}, 50); }, 80);
})); }));
it('should call onTurnStart and onTurnDone before and after each turn, respectively', it('should call onTurnStart and onTurnDone before and after each turn, respectively',
@ -508,10 +508,10 @@ function commonTests() {
}); });
}); });
macroTask(() => { _zone.run(() => { completerA.resolve(null); }); }, 10); macroTask(() => { _zone.run(() => { completerA.resolve(null); }); }, 20);
macroTask(() => { _zone.run(() => { completerB.resolve(null); }); }, 30); macroTask(() => { _zone.run(() => { completerB.resolve(null); }); }, 40);
macroTask(() => { macroTask(() => {
expect(_log.result()) expect(_log.result())
@ -523,7 +523,7 @@ function commonTests() {
// Third VM turn // Third VM turn
'onTurnStart; b then; onTurnDone'); 'onTurnStart; b then; onTurnDone');
async.done(); async.done();
}, 60); }, 80);
})); }));
it('should call onTurnStart and onTurnDone before and after (respectively) all turns in a chain', it('should call onTurnStart and onTurnDone before and after (respectively) all turns in a chain',
@ -543,7 +543,7 @@ function commonTests() {
expect(_log.result()) expect(_log.result())
.toEqual('onTurnStart; run start; run end; async1; async2; onTurnDone'); .toEqual('onTurnStart; run start; run end; async1; async2; onTurnDone');
async.done(); async.done();
}, 50); }, 80);
})); }));
it('should call onTurnStart and onTurnDone for promises created outside of run body', it('should call onTurnStart and onTurnDone for promises created outside of run body',
@ -565,7 +565,7 @@ function commonTests() {
expect(_log.result()) expect(_log.result())
.toEqual('onTurnStart; zone run; onTurnDone; onTurnStart; promise then; onTurnDone'); .toEqual('onTurnStart; zone run; onTurnDone; onTurnStart; promise then; onTurnDone');
async.done(); async.done();
}, 50); }, 80);
})); }));
}); });
@ -596,7 +596,7 @@ function commonTests() {
expect(_errors.length).toBe(1); expect(_errors.length).toBe(1);
expect(_errors[0]).toEqual(exception); expect(_errors[0]).toEqual(exception);
async.done(); async.done();
}, 50); }, 80);
})); }));
it('should call onError when onTurnDone throws and the zone is sync', it('should call onError when onTurnDone throws and the zone is sync',
@ -612,7 +612,7 @@ function commonTests() {
expect(_errors.length).toBe(1); expect(_errors.length).toBe(1);
expect(_errors[0]).toEqual(exception); expect(_errors[0]).toEqual(exception);
async.done(); async.done();
}, 50); }, 80);
})); }));
it('should call onError when onTurnDone throws and the zone is async', it('should call onError when onTurnDone throws and the zone is async',
@ -631,7 +631,7 @@ function commonTests() {
expect(_errors.length).toBe(1); expect(_errors.length).toBe(1);
expect(_errors[0]).toEqual(exception); expect(_errors[0]).toEqual(exception);
async.done(); async.done();
}, 50); }, 80);
})); }));
}); });
} }

48
modules/angular2/test/directives/ng_style_spec.ts
View File

@ -26,14 +26,14 @@ export function main() {
it('should add styles specified in an object literal', it('should add styles specified in an object literal',
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => { inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
var template = `<div [ng-style]="{'text-align': 'right'}"></div>`; var template = `<div [ng-style]="{'max-width': '40px'}"></div>`;
tcb.overrideTemplate(TestComponent, template) tcb.overrideTemplate(TestComponent, template)
.createAsync(TestComponent) .createAsync(TestComponent)
.then((rootTC) => { .then((rootTC) => {
rootTC.detectChanges(); rootTC.detectChanges();
expect(DOM.getStyle(rootTC.componentViewChildren[0].nativeElement, 'text-align')) expect(DOM.getStyle(rootTC.componentViewChildren[0].nativeElement, 'max-width'))
.toEqual('right'); .toEqual('40px');
async.done(); async.done();
}); });
@ -48,16 +48,16 @@ export function main() {
.then((rootTC) => { .then((rootTC) => {
var expr: Map<string, any>; var expr: Map<string, any>;
rootTC.componentInstance.expr = {'text-align': 'right'}; rootTC.componentInstance.expr = {'max-width': '40px'};
rootTC.detectChanges(); rootTC.detectChanges();
expect(DOM.getStyle(rootTC.componentViewChildren[0].nativeElement, 'text-align')) expect(DOM.getStyle(rootTC.componentViewChildren[0].nativeElement, 'max-width'))
.toEqual('right'); .toEqual('40px');
expr = rootTC.componentInstance.expr; expr = rootTC.componentInstance.expr;
expr['text-align'] = 'left'; expr['max-width'] = '30%';
rootTC.detectChanges(); rootTC.detectChanges();
expect(DOM.getStyle(rootTC.componentViewChildren[0].nativeElement, 'text-align')) expect(DOM.getStyle(rootTC.componentViewChildren[0].nativeElement, 'max-width'))
.toEqual('left'); .toEqual('30%');
async.done(); async.done();
}); });
@ -70,14 +70,14 @@ export function main() {
tcb.overrideTemplate(TestComponent, template) tcb.overrideTemplate(TestComponent, template)
.createAsync(TestComponent) .createAsync(TestComponent)
.then((rootTC) => { .then((rootTC) => {
rootTC.componentInstance.expr = {'text-align': 'right'}; rootTC.componentInstance.expr = {'max-width': '40px'};
rootTC.detectChanges(); rootTC.detectChanges();
expect(DOM.getStyle(rootTC.componentViewChildren[0].nativeElement, 'text-align')) expect(DOM.getStyle(rootTC.componentViewChildren[0].nativeElement, 'max-width'))
.toEqual('right'); .toEqual('40px');
StringMapWrapper.delete(rootTC.componentInstance.expr, 'text-align'); StringMapWrapper.delete(rootTC.componentInstance.expr, 'max-width');
rootTC.detectChanges(); rootTC.detectChanges();
expect(DOM.getStyle(rootTC.componentViewChildren[0].nativeElement, 'text-align')) expect(DOM.getStyle(rootTC.componentViewChildren[0].nativeElement, 'max-width'))
.toEqual(''); .toEqual('');
async.done(); async.done();
@ -91,16 +91,16 @@ export function main() {
tcb.overrideTemplate(TestComponent, template) tcb.overrideTemplate(TestComponent, template)
.createAsync(TestComponent) .createAsync(TestComponent)
.then((rootTC) => { .then((rootTC) => {
rootTC.componentInstance.expr = {'text-align': 'right'}; rootTC.componentInstance.expr = {'max-width': '40px'};
rootTC.detectChanges(); rootTC.detectChanges();
expect(DOM.getStyle(rootTC.componentViewChildren[0].nativeElement, 'text-align')) expect(DOM.getStyle(rootTC.componentViewChildren[0].nativeElement, 'max-width'))
.toEqual('right'); .toEqual('40px');
expect(DOM.getStyle(rootTC.componentViewChildren[0].nativeElement, 'font-size')) expect(DOM.getStyle(rootTC.componentViewChildren[0].nativeElement, 'font-size'))
.toEqual('12px'); .toEqual('12px');
StringMapWrapper.delete(rootTC.componentInstance.expr, 'text-align'); StringMapWrapper.delete(rootTC.componentInstance.expr, 'max-width');
rootTC.detectChanges(); rootTC.detectChanges();
expect(DOM.getStyle(rootTC.componentViewChildren[0].nativeElement, 'text-align')) expect(DOM.getStyle(rootTC.componentViewChildren[0].nativeElement, 'max-width'))
.toEqual(''); .toEqual('');
expect(DOM.getStyle(rootTC.componentViewChildren[0].nativeElement, 'font-size')) expect(DOM.getStyle(rootTC.componentViewChildren[0].nativeElement, 'font-size'))
.toEqual('12px'); .toEqual('12px');
@ -116,19 +116,19 @@ export function main() {
tcb.overrideTemplate(TestComponent, template) tcb.overrideTemplate(TestComponent, template)
.createAsync(TestComponent) .createAsync(TestComponent)
.then((rootTC) => { .then((rootTC) => {
rootTC.componentInstance.expr = {'text-align': 'right'}; rootTC.componentInstance.expr = {'max-width': '40px'};
rootTC.detectChanges(); rootTC.detectChanges();
expect(DOM.getStyle(rootTC.componentViewChildren[0].nativeElement, 'text-align')) expect(DOM.getStyle(rootTC.componentViewChildren[0].nativeElement, 'max-width'))
.toEqual('right'); .toEqual('40px');
expect(DOM.getStyle(rootTC.componentViewChildren[0].nativeElement, 'font-size')) expect(DOM.getStyle(rootTC.componentViewChildren[0].nativeElement, 'font-size'))
.toEqual('12px'); .toEqual('12px');
StringMapWrapper.delete(rootTC.componentInstance.expr, 'text-align'); StringMapWrapper.delete(rootTC.componentInstance.expr, 'max-width');
expect(DOM.getStyle(rootTC.componentViewChildren[0].nativeElement, 'font-size')) expect(DOM.getStyle(rootTC.componentViewChildren[0].nativeElement, 'font-size'))
.toEqual('12px'); .toEqual('12px');
rootTC.detectChanges(); rootTC.detectChanges();
expect(DOM.getStyle(rootTC.componentViewChildren[0].nativeElement, 'text-align')) expect(DOM.getStyle(rootTC.componentViewChildren[0].nativeElement, 'max-width'))
.toEqual(''); .toEqual('');
async.done(); async.done();

6
modules/angular2/test/forms/integration_spec.ts
View File

@ -736,6 +736,11 @@ export function main() {
rootTC.componentInstance.form = form; rootTC.componentInstance.form = form;
rootTC.detectChanges(); rootTC.detectChanges();
// In IE, the element needs to be appended to the real DOM,
// otherwise setting .selectionStart fails with "unspecified error"
var isIE = DOM.getUserAgent().indexOf("Trident") > -1;
if (isIE) DOM.appendChild(DOM.defaultDoc().body, rootTC.nativeElement);
var input = rootTC.query(By.css("input")).nativeElement; var input = rootTC.query(By.css("input")).nativeElement;
input.value = "aa"; input.value = "aa";
input.selectionStart = 1; input.selectionStart = 1;
@ -746,6 +751,7 @@ export function main() {
// selection start has not changed because we did not reset the value // selection start has not changed because we did not reset the value
expect(input.selectionStart).toEqual(1); expect(input.selectionStart).toEqual(1);
if (isIE) DOM.removeChild(DOM.defaultDoc().body, rootTC.nativeElement);
}))); })));
}); });
}); });

8
modules/angular2/test/render/dom/view/view_spec.ts
View File

@ -131,10 +131,10 @@ export function main() {
}); });
it('should de-normalize style names', () => { it('should de-normalize style names', () => {
view.setElementStyle(0, 'textAlign', 'right'); view.setElementStyle(0, 'maxWidth', '40px');
expect(DOM.getStyle(el, 'text-align')).toEqual('right'); expect(DOM.getStyle(el, 'max-width')).toEqual('40px');
view.setElementStyle(0, 'textAlign', null); view.setElementStyle(0, 'maxWidth', null);
expect(DOM.getStyle(el, 'text-align')).toEqual(''); expect(DOM.getStyle(el, 'max-width')).toEqual('');
}); });
}); });