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.

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

Update in viewport to use one IO per viewport #307

Merged
merged 4 commits into from
Jul 27, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,9 @@
},
"dependencies": {
"ember-cli-babel": "^6.6.0",
"ember-in-viewport": "~3.0.3"
"ember-in-viewport": "DockYard/ember-in-viewport#enhancement/sn/one-io"
},
"devDependencies": {
"@ember/test-helpers": "^0.7.18",
"broccoli-asset-rev": "^2.7.0",
"ember-cli": "~3.2.0",
"ember-cli-dependency-checker": "^2.0.0",
Expand Down
8 changes: 4 additions & 4 deletions tests/acceptance/infinity-route-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,10 @@ module('Acceptance: Infinity Route - infinity routes', function(hooks) {
await visit('/test-scrollable?perPage=3');

await waitUntil(() => {
return postList().querySelectorAll('li').length === 12;
return postList().querySelectorAll('li').length === 15;
});

shouldBeItemsOnTheList(assert, 12);
shouldBeItemsOnTheList(assert, 15);
});

module('Acceptance: Infinity Route - multiple pages fetched', function(/*hooks*/) {
Expand All @@ -125,10 +125,10 @@ module('Acceptance: Infinity Route - infinity routes', function(hooks) {
document.getElementsByClassName('infinity-loader-above')[0].scrollIntoView(false);

await waitUntil(() => {
return postList().querySelectorAll('li').length === 75;
return postList().querySelectorAll('li').length === 50;
});

shouldBeItemsOnTheList(assert, 75);
shouldBeItemsOnTheList(assert, 50);
});
});

Expand Down
2 changes: 1 addition & 1 deletion tests/unit/mixins/route-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ module('Unit | RouteMixin', function(hooks) {
this.callModelHook(route);
});

test('scott It allows to set startingPage as 0', function(assert) {
test('It allows to set startingPage as 0', function(assert) {
let store = this.createMockStore( this.EA([{id: 1, name: 'Test'}], { total_pages: 1 }) );
let route = this.createRoute(
['item', {
Expand Down
Loading