Skip to content

Commit ab94e9a

Browse files
authored
Merge pull request #490 from robinborst95/fix/infinity-loader-model-changed
2 parents 6524ad1 + 6089801 commit ab94e9a

File tree

2 files changed

+36
-0
lines changed

2 files changed

+36
-0
lines changed

ember-infinity/src/components/infinity-loader.hbs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,6 @@
2020
{{/if}}
2121
{{/if}}
2222
</div>
23+
{{else}}
24+
<div {{did-update this._initialInfinityModelSetup @infinityModel}}></div>
2325
{{/if}}

test-app/tests/integration/infinity-loader-test.js

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,40 @@ module('infinity-loader', function (hooks) {
6666
assert.notOk(find('[data-test-infinity-loader]'), 'Element is not found');
6767
});
6868

69+
test('hideOnInfinity works when reached infinity and changing model', async function (assert) {
70+
this.infinityModel = {
71+
name: 'dot',
72+
reachedInfinity: true,
73+
on: () => {},
74+
off: () => {},
75+
};
76+
await render(hbs`
77+
<InfinityLoader
78+
@infinityModel={{this.infinityModel}}
79+
@hideOnInfinity={{true}}
80+
@infinity={{this.infinityServiceMock}}
81+
/>
82+
`);
83+
84+
assert.notOk(find('[data-test-infinity-loader]'), 'Loader is not shown');
85+
86+
run(() => {
87+
set(this, 'infinityModel', {
88+
name: 'dot2',
89+
reachedInfinity: false,
90+
on: () => {},
91+
off: () => {},
92+
});
93+
});
94+
95+
await waitUntil(
96+
() => {
97+
return find('[data-test-infinity-loader]') != null;
98+
},
99+
{ timeoutMessage: 'Loader is shown' },
100+
);
101+
});
102+
69103
test('hideOnInfinity does not work if hideOnInfinity=false', async function (assert) {
70104
this.infinityModel = {
71105
name: 'dot',

0 commit comments

Comments
 (0)