diff --git a/docs/app/templates/public-pages/docs/test-helpers.hbs b/docs/app/templates/public-pages/docs/test-helpers.hbs
index 81cd05d1..6ed5bc4b 100644
--- a/docs/app/templates/public-pages/docs/test-helpers.hbs
+++ b/docs/app/templates/public-pages/docs/test-helpers.hbs
@@ -22,7 +22,7 @@
Important note: Since version 0.6.0, all the test helpers can also be imported like
- import { calendarCenter, calendarSelect } from 'ember-power-calendar/test-support'; and used
+ import { calendarCenter, calendarSelect } from 'ember-power-calendar/test-support/helpers'; and used
indistinctly in acceptance or integration tests, with or without async/await. If you use this approach
you don't need to register them as global helpers anymore.
@@ -59,7 +59,7 @@
Integration Tests
- Just import the helpers like import { calendarCenter, calendarSelect } from 'ember-power-calendar/test-support';
+ Just import the helpers like import { calendarCenter, calendarSelect } from 'ember-power-calendar/test-support/helpers';
and use them as any other helper 😀
diff --git a/ember-power-calendar/package.json b/ember-power-calendar/package.json
index b61c4363..d0b699d0 100644
--- a/ember-power-calendar/package.json
+++ b/ember-power-calendar/package.json
@@ -98,7 +98,8 @@
"./components/power-calendar/nav.js": "./dist/_app_/components/power-calendar/nav.js",
"./helpers/ember-power-calendar-day-classes.js": "./dist/_app_/helpers/ember-power-calendar-day-classes.js",
"./helpers/power-calendar-format-date.js": "./dist/_app_/helpers/power-calendar-format-date.js",
- "./services/power-calendar.js": "./dist/_app_/services/power-calendar.js"
+ "./services/power-calendar.js": "./dist/_app_/services/power-calendar.js",
+ "./test-support/helpers.js": "./dist/_app_/test-support/helpers.js"
}
},
"peerDependencies": {
diff --git a/ember-power-calendar/rollup.config.mjs b/ember-power-calendar/rollup.config.mjs
index 3fa2d6bf..3a1bf79b 100644
--- a/ember-power-calendar/rollup.config.mjs
+++ b/ember-power-calendar/rollup.config.mjs
@@ -43,6 +43,7 @@ export default [
'components/**/*.js',
'helpers/*.js',
'services/*.js',
+ 'test-support/*.js',
]),
// Follow the V2 Addon rules about dependencies. Your code can import from
diff --git a/ember-power-calendar/src/components/power-calendar-range.js b/ember-power-calendar/src/components/power-calendar-range.js
index 427ce733..f695169d 100644
--- a/ember-power-calendar/src/components/power-calendar-range.js
+++ b/ember-power-calendar/src/components/power-calendar-range.js
@@ -10,8 +10,6 @@ import {
normalizeDuration,
} from '../utils';
import { assert } from '@ember/debug';
-
-import ownProp from '../-private/utils/own-prop';
import PowerCalendarRangeComponent from './power-calendar-range/days';
export default class extends CalendarComponent {
@@ -173,3 +171,7 @@ export default class extends CalendarComponent {
return normalizeRangeActionValue({ date: { start: day.date, end: null } });
}
}
+
+function ownProp(obj, prop) {
+ return Object.prototype.hasOwnProperty.call(obj, prop);
+}
diff --git a/ember-power-calendar/src/test-support.js b/ember-power-calendar/src/test-support/helpers.js
similarity index 96%
rename from ember-power-calendar/src/test-support.js
rename to ember-power-calendar/src/test-support/helpers.js
index deb56877..fb5c004c 100644
--- a/ember-power-calendar/src/test-support.js
+++ b/ember-power-calendar/src/test-support/helpers.js
@@ -1,7 +1,9 @@
import { run } from '@ember/runloop';
import { assert } from '@ember/debug';
import { click, settled, find } from '@ember/test-helpers';
-import { formatDate } from './utils';
+import { formatDate } from '../utils';
+
+export * from '../utils';
function findCalendarElement(selector) {
let target = find(selector);
diff --git a/test-app/app/controllers/application.js b/test-app/app/controllers/application.js
index d67fd4a8..3592f706 100644
--- a/test-app/app/controllers/application.js
+++ b/test-app/app/controllers/application.js
@@ -1,6 +1,3 @@
import Controller from '@ember/controller';
-import {} from 'ember-power-calendar/utils';
-// eslint-disable-next-line ember/no-test-support-import
-import {} from 'ember-power-calendar/test-support';
export default class extends Controller {}
diff --git a/ember-power-calendar/src/-private/utils/own-prop.js b/test-app/app/utils/own-prop.js
similarity index 100%
rename from ember-power-calendar/src/-private/utils/own-prop.js
rename to test-app/app/utils/own-prop.js
diff --git a/test-app/tests/acceptance/helpers-test.js b/test-app/tests/acceptance/helpers-test.js
index d4bee059..6787d1fa 100644
--- a/test-app/tests/acceptance/helpers-test.js
+++ b/test-app/tests/acceptance/helpers-test.js
@@ -4,7 +4,7 @@ import { visit, click } from '@ember/test-helpers';
import {
calendarCenter,
calendarSelect,
-} from 'ember-power-calendar/test-support';
+} from 'ember-power-calendar/test-support/helpers';
module('Acceptance | helpers | calendarCenter', function (hooks) {
setupApplicationTest(hooks);
diff --git a/test-app/tests/assertions/is-calendar.js b/test-app/tests/assertions/is-calendar.js
index 66e6a59d..2acc690d 100644
--- a/test-app/tests/assertions/is-calendar.js
+++ b/test-app/tests/assertions/is-calendar.js
@@ -1,4 +1,4 @@
-import ownProp from 'ember-power-calendar/-private/utils/own-prop';
+import ownProp from 'test-app/utils/own-prop';
export default function isCalendar(calendar, message) {
let result =
diff --git a/test-app/tests/integration/components/power-calendar-multiple-test.js b/test-app/tests/integration/components/power-calendar-multiple-test.js
index 602d20ed..d720d9cb 100644
--- a/test-app/tests/integration/components/power-calendar-multiple-test.js
+++ b/test-app/tests/integration/components/power-calendar-multiple-test.js
@@ -2,9 +2,9 @@
import { module, test } from 'qunit';
import { setupRenderingTest } from 'ember-qunit';
import { render, click } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
+import { hbs } from 'ember-cli-htmlbars';
import { run } from '@ember/runloop';
-import { isSame, formatDate } from 'ember-power-calendar/utils';
+import { isSame, formatDate } from 'ember-power-calendar/test-support/helpers';
module('Integration | Component | ', function (hooks) {
setupRenderingTest(hooks);
diff --git a/test-app/tests/integration/components/power-calendar-multiple/days-test.js b/test-app/tests/integration/components/power-calendar-multiple/days-test.js
index b9d1b177..86636d09 100644
--- a/test-app/tests/integration/components/power-calendar-multiple/days-test.js
+++ b/test-app/tests/integration/components/power-calendar-multiple/days-test.js
@@ -1,7 +1,7 @@
import { module, test } from 'qunit';
import { setupRenderingTest } from 'ember-qunit';
import { render, click } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
+import { hbs } from 'ember-cli-htmlbars';
module(
'Integration | Component | ',
diff --git a/test-app/tests/integration/components/power-calendar-range-test.js b/test-app/tests/integration/components/power-calendar-range-test.js
index 8d82cb25..3b3d5319 100644
--- a/test-app/tests/integration/components/power-calendar-range-test.js
+++ b/test-app/tests/integration/components/power-calendar-range-test.js
@@ -2,11 +2,10 @@
import { module, test } from 'qunit';
import { setupRenderingTest } from 'ember-qunit';
import { render, click } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
+import { hbs } from 'ember-cli-htmlbars';
import { run } from '@ember/runloop';
-import { isSame } from 'ember-power-calendar/utils';
-
-import ownProp from 'ember-power-calendar/-private/utils/own-prop';
+import { isSame } from 'ember-power-calendar/test-support/helpers';
+import ownProp from 'test-app/utils/own-prop';
module('Integration | Component | ', function (hooks) {
setupRenderingTest(hooks);
@@ -154,7 +153,6 @@ module('Integration | Component | ', function (hooks) {
});
test('When an range date object is passed, the range selection behavior is skipped', async function (assert) {
- assert.expect(4);
this.rangeToSelect = { date: { start: undefined, end: undefined } };
this.selected = {
date: { start: new Date(2013, 9, 5), end: new Date(2013, 9, 10) },
diff --git a/test-app/tests/integration/components/power-calendar-test.js b/test-app/tests/integration/components/power-calendar-test.js
index e61ee2f9..6bf089fc 100644
--- a/test-app/tests/integration/components/power-calendar-test.js
+++ b/test-app/tests/integration/components/power-calendar-test.js
@@ -1,13 +1,12 @@
import { module, test } from 'qunit';
import { setupRenderingTest } from 'ember-qunit';
import { render, click, focus, triggerKeyEvent } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
+import { hbs } from 'ember-cli-htmlbars';
import { run, later } from '@ember/runloop';
import RSVP from 'rsvp';
import require from 'require';
import { importSync } from '@embroider/macros';
-
-import ownProp from 'ember-power-calendar/-private/utils/own-prop';
+import ownProp from 'test-app/utils/own-prop';
const dateLibrary = require.has('luxon') ? 'luxon' : 'moment';
diff --git a/test-app/tests/integration/components/power-calendar/days-test.js b/test-app/tests/integration/components/power-calendar/days-test.js
index 87e14317..5b840aac 100644
--- a/test-app/tests/integration/components/power-calendar/days-test.js
+++ b/test-app/tests/integration/components/power-calendar/days-test.js
@@ -1,12 +1,11 @@
import { module, test } from 'qunit';
import { setupRenderingTest } from 'ember-qunit';
import { render } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
+import { hbs } from 'ember-cli-htmlbars';
import { run } from '@ember/runloop';
import require from 'require';
import { TrackedObject } from 'tracked-built-ins';
-
-import ownProp from 'ember-power-calendar/-private/utils/own-prop';
+import ownProp from 'test-app/utils/own-prop';
const dateLibrary = require.has('luxon') ? 'luxon' : 'moment';
let calendarService;
diff --git a/test-app/tests/integration/components/power-calendar/nav-test.js b/test-app/tests/integration/components/power-calendar/nav-test.js
index 055a52b4..837626f8 100644
--- a/test-app/tests/integration/components/power-calendar/nav-test.js
+++ b/test-app/tests/integration/components/power-calendar/nav-test.js
@@ -1,7 +1,7 @@
import { module, test } from 'qunit';
import { setupRenderingTest } from 'ember-qunit';
import { render, click } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
+import { hbs } from 'ember-cli-htmlbars';
import { run } from '@ember/runloop';
let calendarService;
diff --git a/test-app/tests/integration/test-helpers/calendar-center-test.js b/test-app/tests/integration/test-helpers/calendar-center-test.js
index 5bddfa55..00dc55e7 100644
--- a/test-app/tests/integration/test-helpers/calendar-center-test.js
+++ b/test-app/tests/integration/test-helpers/calendar-center-test.js
@@ -1,8 +1,8 @@
import { module, test } from 'qunit';
import { setupRenderingTest } from 'ember-qunit';
import { render } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
-import { calendarCenter } from 'ember-power-calendar/test-support';
+import { hbs } from 'ember-cli-htmlbars';
+import { calendarCenter } from 'ember-power-calendar/test-support/helpers';
module('Test Support | Helper | calendarCenter', function (hooks) {
setupRenderingTest(hooks);
diff --git a/test-app/tests/integration/test-helpers/calendar-select-test.js b/test-app/tests/integration/test-helpers/calendar-select-test.js
index 646a0368..9846f124 100644
--- a/test-app/tests/integration/test-helpers/calendar-select-test.js
+++ b/test-app/tests/integration/test-helpers/calendar-select-test.js
@@ -1,8 +1,8 @@
import { module, test } from 'qunit';
import { setupRenderingTest } from 'ember-qunit';
import { render } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
-import { calendarSelect } from 'ember-power-calendar/test-support';
+import { hbs } from 'ember-cli-htmlbars';
+import { calendarSelect } from 'ember-power-calendar/test-support/helpers';
module('Test Support | Helper | calendarSelect', function (hooks) {
setupRenderingTest(hooks);
diff --git a/test-app/tests/unit/utils/date-utils-test.js b/test-app/tests/unit/utils/date-utils-test.js
index e9893074..fcba48ba 100644
--- a/test-app/tests/unit/utils/date-utils-test.js
+++ b/test-app/tests/unit/utils/date-utils-test.js
@@ -1,5 +1,5 @@
import { module, test } from 'qunit';
-import { add } from 'ember-power-calendar/utils';
+import { add } from 'ember-power-calendar/test-support/helpers';
module('Unit | Utility | date-utils', function () {
test('can add seconds', function (assert) {