javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-20 12:29:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

test(refresher): fix refresher unit tests

Browse Source
This commit is contained in:
Adam Bradley
2016-02-29 13:27:44 -06:00
parent 4e3604e3ed
commit d39f21f410
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ionic/components/refresher/refresher.ts
View File

@ -302,12 +302,13 @@ export class Refresher {
// this refresh is not already actively pulling down
// get the content's scrollTop
let scrollHostScrollTop = this._content.scrollElement.scrollTop;
let scrollHostScrollTop = this._content.getContentDimensions().scrollTop;
// if the scrollTop is greater than zero then it's
// not possible to pull the content down yet
if (scrollHostScrollTop > 0) {
this.progress = 0;
this.startY = null;
return 7;
}

13
ionic/components/refresher/test/refresher.spec.ts
View File

@ -119,6 +119,8 @@ describe('Refresher', () => {
let result = refresher._onMove( touchEv(125) );
expect(refresher.state).toEqual('inactive');
expect(refresher.progress).toEqual(0);
expect(refresher.startY).toEqual(null);
expect(result).toEqual(7);
});
@ -153,13 +155,16 @@ describe('Refresher', () => {
});
it('should set the deltaY', () => {
setContentScrollTop(1);
refresher.startY = 100;
refresher._onMove( touchEv(133) );
expect(refresher.deltaY).toEqual(33);
refresher._lastCheck = 0; // force allow next check
refresher.startY = 100;
refresher._onMove( touchEv(50) );
var results = refresher._onMove( touchEv(50) );
expect(results).toEqual(6);
expect(refresher.deltaY).toEqual(-50);
});
@ -245,7 +250,11 @@ describe('Refresher', () => {
}
function setContentScrollTop(scrollTop) {
contentElementRef.nativeElement.scrollTop = scrollTop;
content.getContentDimensions = function() {
return {
scrollTop: scrollTop
};
};
}
function getScrollElementStyles() {