PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Rewrite ScrollPanel test

Browse source 
It turns out that Chrome now implements scroll-anchoring itself (ie, content
stays in the same place when you add more stuff off-screen), which means we
cannot rely on back-pagination to make ScrollPanel do a scroll.

Instead, just do a scrollToToken. Which turns out to be considerably simpler
anyway.
This commit is contained in:
Richard van der Hoff 2017-07-05 14:34:25 +01:00
parent 0af77e8913
commit 167ce88a80
1 changed files with 20 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
test/components/structures/ScrollPanel-test.js
View file

@ -192,52 +192,37 @@ describe('ScrollPanel', function() {
} }
}); });
it('should handle scrollEvent strangeness', function(done) { it('should handle scrollEvent strangeness', function() {
var events = []; const events = [];
q().then(() => { return q().then(() => {
// initialise with a few events // initialise with a load of events
for (var i = 0; i < 10; i++) { for (let i = 0; i < 20; i++) {
events.push(i+90); events.push(i+80);
} }
tester.setTileKeys(events); tester.setTileKeys(events);
expect(tester.fillCounts.b).toEqual(1); expect(scrollingDiv.scrollHeight).toEqual(3050); // 20*150 + 50
expect(tester.fillCounts.f).toEqual(2); expect(scrollingDiv.scrollTop).toEqual(3050 - 600);
expect(scrollingDiv.scrollHeight).toEqual(1550) // 10*150 + 50
expect(scrollingDiv.scrollTop).toEqual(1550 - 600);
return tester.awaitScroll(); return tester.awaitScroll();
}).then(() => { }).then(() => {
expect(tester.lastScrollEvent).toBe(950); expect(tester.lastScrollEvent).toBe(3050 - 600);
// we want to simulate back-filling as we scroll up tester.scrollPanel().scrollToToken("92", 0);
tester.addFillHandler('b', function() {
var newEvents = [];
for (var i = 0; i < 10; i++) {
newEvents.push(i+80);
}
events.unshift.apply(events, newEvents);
tester.setTileKeys(events);
return q(true);
});
// simulate scrolling up; this should trigger the backfill
scrollingDiv.scrollTop = 200;
return tester.awaitFill('b');
}).then(() => {
console.log('filled');
// at this point, ScrollPanel will have updated scrollTop, but // at this point, ScrollPanel will have updated scrollTop, but
// the event hasn't fired. Stamp over the scrollTop. // the event hasn't fired.
expect(tester.lastScrollEvent).toEqual(200); expect(tester.lastScrollEvent).toEqual(3050 - 600);
expect(scrollingDiv.scrollTop).toEqual(10*150 + 200); expect(scrollingDiv.scrollTop).toEqual(1950);
// now stamp over the scrollTop.
console.log('faking #528');
scrollingDiv.scrollTop = 500; scrollingDiv.scrollTop = 500;
return tester.awaitScroll(); return tester.awaitScroll();
}).then(() => { }).then(() => {
expect(tester.lastScrollEvent).toBe(10*150 + 200); expect(tester.lastScrollEvent).toBe(1950);
expect(scrollingDiv.scrollTop).toEqual(10*150 + 200); expect(scrollingDiv.scrollTop).toEqual(1950);
}).done(done); });
}); });
it('should not get stuck in #528 workaround', function(done) { it('should not get stuck in #528 workaround', function(done) {
@ -250,7 +235,7 @@ describe('ScrollPanel', function() {
tester.setTileKeys(events); tester.setTileKeys(events);
expect(tester.fillCounts.b).toEqual(1); expect(tester.fillCounts.b).toEqual(1);
expect(tester.fillCounts.f).toEqual(2); expect(tester.fillCounts.f).toEqual(2);
expect(scrollingDiv.scrollHeight).toEqual(6050) // 40*150 + 50 expect(scrollingDiv.scrollHeight).toEqual(6050); // 40*150 + 50
expect(scrollingDiv.scrollTop).toEqual(6050 - 600); expect(scrollingDiv.scrollTop).toEqual(6050 - 600);
// try to scroll up, to a non-integer offset. // try to scroll up, to a non-integer offset.