Skip to content
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
2 changes: 2 additions & 0 deletions ember-infinity/src/components/infinity-loader.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,6 @@
{{/if}}
{{/if}}
</div>
{{else}}
<div {{did-update this._initialInfinityModelSetup @infinityModel}}></div>
{{/if}}
34 changes: 34 additions & 0 deletions test-app/tests/integration/infinity-loader-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,40 @@ module('infinity-loader', function (hooks) {
assert.notOk(find('[data-test-infinity-loader]'), 'Element is not found');
});

test('hideOnInfinity works when reached infinity and changing model', async function (assert) {
this.infinityModel = {
name: 'dot',
reachedInfinity: true,
on: () => {},
off: () => {},
};
await render(hbs`
<InfinityLoader
@infinityModel={{this.infinityModel}}
@hideOnInfinity={{true}}
@infinity={{this.infinityServiceMock}}
/>
`);

assert.notOk(find('[data-test-infinity-loader]'), 'Loader is not shown');

run(() => {
set(this, 'infinityModel', {
name: 'dot2',
reachedInfinity: false,
on: () => {},
off: () => {},
});
});

await waitUntil(
() => {
return find('[data-test-infinity-loader]') != null;
},
{ timeoutMessage: 'Loader is shown' },
);
});

test('hideOnInfinity does not work if hideOnInfinity=false', async function (assert) {
this.infinityModel = {
name: 'dot',
Expand Down