Skip to content

Commit 1697113

Browse files
committed
fix: add conditional tests
1 parent c8612c1 commit 1697113

File tree

2 files changed

+41
-12
lines changed

2 files changed

+41
-12
lines changed

test-app/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
"@ember/optional-features": "^2.0.0",
3838
"@ember/string": "^3.1.1",
3939
"@ember/test-helpers": "^2.9.3",
40+
"@embroider/macros": "^1.13.2",
4041
"@embroider/test-setup": "^2.0.2",
4142
"@glimmer/component": "^1.1.2",
4243
"@glimmer/tracking": "^1.1.2",
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,71 @@
11
import { module, test } from 'qunit';
22
import { setupApplicationTest } from 'ember-qunit';
33
import { visit, find, click } from '@ember/test-helpers';
4+
import { macroCondition, dependencySatisfies } from '@embroider/macros';
45

56
module('Acceptance | Engine Router Service | Refresh Method', function (hooks) {
67
setupApplicationTest(hooks);
78

89
test('refresh without params triggers refresh with current route', async function (assert) {
10+
assert.expect(1);
11+
912
await visit('/routable-engine-demo/ember-blog/new');
1013

1114
let counter = await find('.route-refresh-counter').textContent;
1215
await click('.refresh');
1316

14-
counter = parseInt(counter, 10);
15-
counter = ++counter;
16-
counter = counter.toString();
17-
assert.dom('.route-refresh-counter').hasText(counter);
17+
if (macroCondition(dependencySatisfies('ember-source', '>= 4.1.0'))) {
18+
counter = parseInt(counter, 10);
19+
counter = ++counter;
20+
counter = counter.toString();
21+
assert.dom('.route-refresh-counter').hasText(counter);
22+
} else {
23+
// eslint-disable-next-line qunit/no-conditional-assertions
24+
assert.throws(
25+
'Refresh method is not available in ember-source below v4.1'
26+
);
27+
}
1828
});
1929

2030
test('refresh with params triggers refresh on provided route', async function (assert) {
31+
assert.expect(1);
32+
2133
await visit('/routable-engine-demo/ember-blog/new');
2234

2335
let counter = await find('.route-refresh-counter').textContent;
2436
await click('.refresh-route');
2537

26-
counter = parseInt(counter, 10);
27-
counter = ++counter;
28-
counter = counter.toString();
29-
assert.dom('.route-refresh-counter').hasText(counter);
38+
if (macroCondition(dependencySatisfies('ember-source', '>= 4.1.0'))) {
39+
counter = parseInt(counter, 10);
40+
counter = ++counter;
41+
counter = counter.toString();
42+
assert.dom('.route-refresh-counter').hasText(counter);
43+
} else {
44+
// eslint-disable-next-line qunit/no-conditional-assertions
45+
assert.throws(
46+
'Refresh method is not available in ember-source below v4.1'
47+
);
48+
}
3049
});
3150

3251
test('refresh external route', async function (assert) {
52+
assert.expect(1);
53+
3354
await visit('/routable-engine-demo/ember-blog/new');
3455

3556
let counter = await find('.route-refresh-counter').textContent;
3657
await click('.refresh-external');
3758

38-
counter = parseInt(counter, 10);
39-
counter = ++counter;
40-
counter = counter.toString();
41-
assert.dom('.global-refresh-counter').hasText(counter);
59+
if (macroCondition(dependencySatisfies('ember-source', '>= 4.1.0'))) {
60+
counter = parseInt(counter, 10);
61+
counter = ++counter;
62+
counter = counter.toString();
63+
assert.dom('.global-refresh-counter').hasText(counter);
64+
} else {
65+
// eslint-disable-next-line qunit/no-conditional-assertions
66+
assert.throws(
67+
'Refresh method is not available in ember-source below v4.1'
68+
);
69+
}
4270
});
4371
});

0 commit comments

Comments
 (0)