Skip to content

Commit

Permalink
Merge pull request #19540 from emberjs/bugfix/ensure-ember-testing-is…
Browse files Browse the repository at this point in the history
…-loaded-lazily

[BUGFIX release] Ensure ember-testing is loaded lazily
  • Loading branch information
Chris Garrett committed May 12, 2021
2 parents 8c5a1f6 + 995d6a7 commit 9b2c458
Showing 1 changed file with 25 additions and 9 deletions.
34 changes: 25 additions & 9 deletions packages/@ember/test/index.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,27 @@
import { Test } from 'ember-testing';
import require, { has } from 'require';

const {
registerAsyncHelper,
registerHelper,
registerWaiter,
unregisterHelper,
unregisterWaiter,
} = Test;
export let registerAsyncHelper;
export let registerHelper;
export let registerWaiter;
export let unregisterHelper;
export let unregisterWaiter;

export { registerAsyncHelper, registerHelper, registerWaiter, unregisterHelper, unregisterWaiter };
if (has('ember-testing')) {
let { Test } = require('ember-testing');

registerAsyncHelper = Test.registerAsyncHelper;
registerHelper = Test.registerHelper;
registerWaiter = Test.registerWaiter;
unregisterHelper = Test.unregisterHelper;
unregisterWaiter = Test.unregisterWaiter;
} else {
let testingNotAvailableMessage = () => {
throw new Error('Attempted to use test utilities, but `ember-testing` was not included');
};

registerAsyncHelper = testingNotAvailableMessage;
registerHelper = testingNotAvailableMessage;
registerWaiter = testingNotAvailableMessage;
unregisterHelper = testingNotAvailableMessage;
unregisterWaiter = testingNotAvailableMessage;
}

0 comments on commit 9b2c458

Please sign in to comment.