Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 0 additions & 27 deletions broccoli/amd-compat-entrypoints/ember-testing.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,30 +21,6 @@ d('ember-testing/lib/ext/application', emberTestingLibExtApplication);
import * as emberTestingLibExtRsvp from 'ember-testing/lib/ext/rsvp';
d('ember-testing/lib/ext/rsvp', emberTestingLibExtRsvp);

import * as emberTestingLibHelpers from 'ember-testing/lib/helpers';
d('ember-testing/lib/helpers', emberTestingLibHelpers);

import * as emberTestingLibHelpersAndThen from 'ember-testing/lib/helpers/and_then';
d('ember-testing/lib/helpers/and_then', emberTestingLibHelpersAndThen);

import * as emberTestingLibHelpersCurrentPath from 'ember-testing/lib/helpers/current_path';
d('ember-testing/lib/helpers/current_path', emberTestingLibHelpersCurrentPath);

import * as emberTestingLibHelpersCurrentRouteName from 'ember-testing/lib/helpers/current_route_name';
d('ember-testing/lib/helpers/current_route_name', () => emberTestingLibHelpersCurrentRouteName);

import * as emberTestingLibHelpersCurrentUrl from 'ember-testing/lib/helpers/current_url';
d('ember-testing/lib/helpers/current_url', emberTestingLibHelpersCurrentUrl);

import * as emberTestingLibHelpersPauseTest from 'ember-testing/lib/helpers/pause_test';
d('ember-testing/lib/helpers/pause_test', emberTestingLibHelpersPauseTest);

import * as emberTestingLibHelpersVisit from 'ember-testing/lib/helpers/visit';
d('ember-testing/lib/helpers/visit', emberTestingLibHelpersVisit);

import * as emberTestingLibHelpersWait from 'ember-testing/lib/helpers/wait';
d('ember-testing/lib/helpers/wait', emberTestingLibHelpersWait);

import * as emberTestingLibInitializers from 'ember-testing/lib/initializers';
d('ember-testing/lib/initializers', emberTestingLibInitializers);

Expand All @@ -60,9 +36,6 @@ d('ember-testing/lib/test', emberTestingLibTest);
import * as emberTestingLibTestAdapter from 'ember-testing/lib/test/adapter';
d('ember-testing/lib/test/adapter', emberTestingLibTestAdapter);

import * as emberTestingLibTestHelpers from 'ember-testing/lib/test/helpers';
d('ember-testing/lib/test/helpers', emberTestingLibTestHelpers);

import * as emberTestingLibTestOnInjectHelpers from 'ember-testing/lib/test/on_inject_helpers';
d('ember-testing/lib/test/on_inject_helpers', emberTestingLibTestOnInjectHelpers);

Expand Down
9 changes: 0 additions & 9 deletions lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -207,20 +207,11 @@ const shim = addonV1Shim(path.join(__dirname, '..'), {
'./dist/packages/ember-testing/lib/adapters/qunit.js',
'./dist/packages/ember-testing/lib/ext/application.js',
'./dist/packages/ember-testing/lib/ext/rsvp.js',
'./dist/packages/ember-testing/lib/helpers.js',
'./dist/packages/ember-testing/lib/helpers/and_then.js',
'./dist/packages/ember-testing/lib/helpers/current_path.js',
'./dist/packages/ember-testing/lib/helpers/current_route_name.js',
'./dist/packages/ember-testing/lib/helpers/current_url.js',
'./dist/packages/ember-testing/lib/helpers/pause_test.js',
'./dist/packages/ember-testing/lib/helpers/visit.js',
'./dist/packages/ember-testing/lib/helpers/wait.js',
'./dist/packages/ember-testing/lib/initializers.js',
'./dist/packages/ember-testing/lib/public-api.js',
'./dist/packages/ember-testing/lib/setup_for_testing.js',
'./dist/packages/ember-testing/lib/test.js',
'./dist/packages/ember-testing/lib/test/adapter.js',
'./dist/packages/ember-testing/lib/test/helpers.js',
'./dist/packages/ember-testing/lib/test/on_inject_helpers.js',
'./dist/packages/ember-testing/lib/test/pending_requests.js',
'./dist/packages/ember-testing/lib/test/promise.js',
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -387,4 +387,4 @@
}
},
"packageManager": "pnpm@10.5.0"
}
}
9 changes: 0 additions & 9 deletions packages/ember-testing/lib/ext/application.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import EmberApplication from '@ember/application';
import setupForTesting from '../setup_for_testing';
import { helpers } from '../test/helpers';
import TestPromise, { resolve, getLastPromise } from '../test/promise';
import run from '../test/run';
import { invokeInjectHelpersCallbacks } from '../test/on_inject_helpers';
Expand Down Expand Up @@ -133,14 +132,6 @@
});

this.testHelpers = {};
for (let name in helpers) {
// SAFETY: It is safe to access a property on an object
this.originalMethods[name] = (this.helperContainer as any)[name];
// SAFETY: It is not quite as safe to do this, but it _seems_ to be ok.
this.testHelpers[name] = (this.helperContainer as any)[name] = helper(this, name);
// SAFETY: We checked that it exists
protoWrap(TestPromise.prototype, name, helper(this, name), helpers[name]!.meta.wait);
}

invokeInjectHelpersCallbacks(this);
},
Expand All @@ -163,7 +154,7 @@
return;
}

for (let name in helpers) {

Check failure on line 157 in packages/ember-testing/lib/ext/application.ts

View workflow job for this annotation

GitHub Actions / tests / Type Checking (current version)

Cannot find name 'helpers'. Did you mean 'helper'?
this.helperContainer[name] = this.originalMethods[name];
// SAFETY: This is a weird thing, but it's not technically unsafe here.
delete (TestPromise.prototype as any)[name];
Expand All @@ -176,7 +167,7 @@
// This method is no longer needed
// But still here for backwards compatibility
// of helper chaining
function protoWrap(proto: TestPromise<unknown>, name: string, callback: AnyFn, isAsync: boolean) {

Check failure on line 170 in packages/ember-testing/lib/ext/application.ts

View workflow job for this annotation

GitHub Actions / tests / Linting

'protoWrap' is defined but never used. Allowed unused vars must match /^_/u
// SAFETY: This isn't entirely safe, but it _seems_ to be ok.
(proto as any)[name] = function (...args: unknown[]) {
if (isAsync) {
Expand All @@ -190,8 +181,8 @@
};
}

function helper(app: TestableApp, name: string) {

Check failure on line 184 in packages/ember-testing/lib/ext/application.ts

View workflow job for this annotation

GitHub Actions / tests / Linting

'helper' is defined but never used. Allowed unused vars must match /^_/u
let helper = helpers[name];

Check failure on line 185 in packages/ember-testing/lib/ext/application.ts

View workflow job for this annotation

GitHub Actions / tests / Type Checking (current version)

Cannot find name 'helpers'. Did you mean 'helper'?
assert(`[BUG] Missing helper: ${name}`, helper);
let fn = helper.method;
let meta = helper.meta;
Expand Down
18 changes: 0 additions & 18 deletions packages/ember-testing/lib/helpers.ts

This file was deleted.

1 change: 0 additions & 1 deletion packages/ember-testing/lib/public-api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@ export { default as QUnitAdapter } from './adapters/qunit';

import './ext/application';
import './ext/rsvp'; // setup RSVP + run loop integration
import './helpers'; // adds helpers to helpers object in Test
import './initializers'; // to setup initializer
13 changes: 0 additions & 13 deletions packages/ember-testing/lib/test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/**
@module ember
*/
import { helpers, registerHelper, registerAsyncHelper, unregisterHelper } from './test/helpers';
import { onInjectHelpers } from './test/on_inject_helpers';
import TestPromise, { promise, resolve } from './test/promise';
import { checkWaiters, registerWaiter, unregisterWaiter } from './test/waiters';
Expand All @@ -21,18 +20,6 @@ import { getAdapter, setAdapter } from './test/adapter';
@public
*/
const Test = {
/**
Hash containing all known test helpers.

@property _helpers
@private
@since 1.7.0
*/
_helpers: helpers,

registerHelper,
registerAsyncHelper,
unregisterHelper,
onInjectHelpers,
Promise: TestPromise,
promise,
Expand Down
138 changes: 0 additions & 138 deletions packages/ember-testing/lib/test/helpers.ts

This file was deleted.

100 changes: 0 additions & 100 deletions packages/ember-testing/tests/helper_registration_test.js

This file was deleted.

Loading
Loading