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

fix: fix flaky test cases of passive events (#35679) 

PR Close #35679
This commit is contained in:
JiaLiPassion 2020-02-26 15:14:11 +09:00 committed by Matias Niemelä
parent a1d0396c55
commit 8ef29b65ff
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
packages/zone.js/test/browser/browser.spec.ts
View File

@ -215,14 +215,19 @@ describe('Zone', function() {
scrollEvent.initEvent('scroll', true, true); scrollEvent.initEvent('scroll', true, true);
const zone = Zone.current.fork({name: 'run'}); const zone = Zone.current.fork({name: 'run'});
const div = document.createElement('div');
document.body.appendChild(div);
Zone.current.fork({name: 'scroll'}).run(() => { Zone.current.fork({name: 'scroll'}).run(() => {
document.addEventListener( const listener = () => {
'scroll', () => { expect(Zone.current.name).toEqual(zone.name); }); expect(Zone.current.name).toEqual(zone.name);
div.removeEventListener('scroll', listener);
};
div.addEventListener('scroll', listener);
}); });
zone.run(() => { document.dispatchEvent(scrollEvent); }); zone.run(() => { div.dispatchEvent(scrollEvent); });
(document as any).removeAllListeners('scroll'); document.body.removeChild(div);
}); });
it('should be able to clear on handler added before load zone.js', function() { it('should be able to clear on handler added before load zone.js', function() {
@ -1047,12 +1052,16 @@ describe('Zone', function() {
const testPassive = function(eventName: string, expectedPassiveLog: string, options: any) { const testPassive = function(eventName: string, expectedPassiveLog: string, options: any) {
(button as any).addEventListener(eventName, listener, options); (button as any).addEventListener(eventName, listener, options);
const evt = document.createEvent('Event'); const evt = document.createEvent('Event');
evt.initEvent(eventName, true, true); evt.initEvent(eventName, false, true);
button.dispatchEvent(evt); button.dispatchEvent(evt);
expect(logs).toEqual(['default will run', expectedPassiveLog]); expect(logs).toEqual(['default will run', expectedPassiveLog]);
(button as any).removeAllListeners(eventName); (button as any).removeAllListeners(eventName);
}; };
beforeEach(() => { logs = []; }); beforeEach(() => {
logs = [];
(button as any).removeAllListeners();
});
afterEach(() => { (button as any).removeAllListeners(); });
it('should be passive with global variable defined', it('should be passive with global variable defined',
() => { testPassive('touchstart', 'default will run', {passive: true}); }); () => { testPassive('touchstart', 'default will run', {passive: true}); });
it('should not be passive without global variable defined', it('should not be passive without global variable defined',
@ -1065,10 +1074,8 @@ describe('Zone', function() {
() => { testPassive('touchstart', 'default will run', true); }); () => { testPassive('touchstart', 'default will run', true); });
it('should not be passive with global variable defined with passive false option', it('should not be passive with global variable defined with passive false option',
() => { testPassive('touchstart', 'defaultPrevented', {passive: false}); }); () => { testPassive('touchstart', 'defaultPrevented', {passive: false}); });
it('should be passive with global variable defined and also blacklisted', () => { it('should be passive with global variable defined and also blacklisted',
(document as any).removeAllListeners('scroll'); () => { testPassive('scroll', 'default will run', undefined); });
testPassive('scroll', 'default will run', undefined);
});
it('should not be passive without global variable defined and also blacklisted', it('should not be passive without global variable defined and also blacklisted',
() => { testPassive('wheel', 'defaultPrevented', undefined); }); () => { testPassive('wheel', 'defaultPrevented', undefined); });
}); });