Skip to content

Commit 665edc3

Browse files
committed
Fixes
1 parent 3e82321 commit 665edc3

4 files changed

Lines changed: 45 additions & 7 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ jobs:
9797
- ember-lts-5.4
9898
- ember-lts-5.8
9999
- ember-lts-5.12
100+
- ember-lts-6.4
100101
- glimmer-component-v1
101102
- ember-release
102103
- ember-beta

docs/config/ember-try.js

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ module.exports = async function () {
1616
'ember-cli': '~4.12.2',
1717
'ember-source': '~3.28.0',
1818
'@ember/test-helpers': '^2.9.3',
19+
'ember-load-initializers': '^2.1.2',
1920
'ember-qunit': '^6.2.0',
2021
},
2122
},
@@ -25,6 +26,9 @@ module.exports = async function () {
2526
npm: {
2627
devDependencies: {
2728
'@glimmer/component': '^1.1.2',
29+
'@ember/test-helpers': '5.1.0',
30+
'@ember/test-waiters': '^3.1.0',
31+
'ember-load-initializers': '^2.1.2',
2832
'ember-resolver': '^8.0.0',
2933
'ember-source': '~4.4.0',
3034
},
@@ -64,6 +68,22 @@ module.exports = async function () {
6468
},
6569
},
6670
},
71+
{
72+
name: 'ember-lts-5.12',
73+
npm: {
74+
devDependencies: {
75+
'ember-source': '~5.12.0',
76+
},
77+
},
78+
},
79+
{
80+
name: 'ember-lts-6.4',
81+
npm: {
82+
devDependencies: {
83+
'ember-source': '~6.4.0',
84+
},
85+
},
86+
},
6787
{
6888
name: 'glimmer-component-v1',
6989
npm: {

test-app/config/ember-try.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,14 @@ module.exports = async function () {
7272
},
7373
},
7474
},
75+
{
76+
name: 'ember-lts-6.4',
77+
npm: {
78+
devDependencies: {
79+
'ember-source': '~6.4.0',
80+
},
81+
},
82+
},
7583
{
7684
name: 'glimmer-component-v1',
7785
npm: {

test-app/tests/integration/components/power-calendar-test.js

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,20 @@ import { render, click, focus, triggerKeyEvent } from '@ember/test-helpers';
44
import { hbs } from 'ember-cli-htmlbars';
55
import { run, later } from '@ember/runloop';
66
import RSVP from 'rsvp';
7-
import require from 'require';
8-
import { importSync } from '@embroider/macros';
7+
import {
8+
dependencySatisfies,
9+
macroCondition,
10+
importSync,
11+
} from '@embroider/macros';
912
import ownProp from 'test-app/utils/own-prop';
1013

11-
const dateLibrary = require.has('luxon') ? 'luxon' : 'moment';
14+
let dateLibrary = '';
15+
16+
if (macroCondition(dependencySatisfies('moment', '*'))) {
17+
dateLibrary = 'moment';
18+
} else if (macroCondition(dependencySatisfies('luxon', '*'))) {
19+
dateLibrary = 'luxon';
20+
}
1221

1322
module('Integration | Component | <PowerCalendar>', function (hooks) {
1423
setupRenderingTest(hooks);
@@ -1138,8 +1147,8 @@ module('Integration | Component | <PowerCalendar>', function (hooks) {
11381147

11391148
test('user can provide `@tag` attribute', async function (assert) {
11401149
assert.expect(1);
1141-
await render(hbs`
1142-
<PowerCalendar @tag="li" />
1150+
await render(hbs`
1151+
<PowerCalendar @tag="li" />
11431152
`);
11441153
assert
11451154
.dom('li.ember-power-calendar')
@@ -1148,8 +1157,8 @@ module('Integration | Component | <PowerCalendar>', function (hooks) {
11481157

11491158
test('user can provide empty `@tag` attribute', async function (assert) {
11501159
assert.expect(1);
1151-
await render(hbs`
1152-
<PowerCalendar @tag="" />
1160+
await render(hbs`
1161+
<PowerCalendar @tag="" />
11531162
`);
11541163
assert
11551164
.dom('.ember-power-calendar')

0 commit comments

Comments
 (0)