Merge pull request #21257 from emberjs/kg-remove-old-testing

Remove old testing apis

Author: NullVoxPopuli

broccoli/amd-compat-entrypoints/ember-testing.js

@@ -12,68 +12,17 @@ d('ember-testing/index', emberTestingIndex);
 import * as emberTestingLibAdaptersAdapter from 'ember-testing/lib/adapters/adapter';
 d('ember-testing/lib/adapters/adapter', emberTestingLibAdaptersAdapter);
 
-import * as emberTestingLibAdaptersQunit from 'ember-testing/lib/adapters/qunit';
-d('ember-testing/lib/adapters/qunit', emberTestingLibAdaptersQunit);
-
-import * as emberTestingLibExtApplication from 'ember-testing/lib/ext/application';
-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);
-
 import * as emberTestingLibPublicApi from 'ember-testing/lib/public-api';
 d('ember-testing/lib/public-api', emberTestingLibPublicApi);
 
-import * as emberTestingLibSetupForTesting from 'ember-testing/lib/setup_for_testing';
-d('ember-testing/lib/setup_for_testing', emberTestingLibSetupForTesting);
-
 import * as emberTestingLibTest from 'ember-testing/lib/test';
 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);
-
 import * as emberTestingLibTestPendingRequests from 'ember-testing/lib/test/pending_requests';
 d('ember-testing/lib/test/pending_requests', emberTestingLibTestPendingRequests);
 
-import * as emberTestingLibTestPromise from 'ember-testing/lib/test/promise';
-d('ember-testing/lib/test/promise', emberTestingLibTestPromise);
-
-import * as emberTestingLibTestRun from 'ember-testing/lib/test/run';
-d('ember-testing/lib/test/run', emberTestingLibTestRun);
-
 import * as emberTestingLibTestWaiters from 'ember-testing/lib/test/waiters';
 d('ember-testing/lib/test/waiters', emberTestingLibTestWaiters);

lib/index.js

@@ -214,27 +214,10 @@ const shim = addonV1Shim(path.join(__dirname, '..'), {
           'implicit-test-modules': [
             './dist/dev/packages/ember-testing/index.js',
             './dist/dev/packages/ember-testing/lib/adapters/adapter.js',
-            './dist/dev/packages/ember-testing/lib/adapters/qunit.js',
-            './dist/dev/packages/ember-testing/lib/ext/application.js',
-            './dist/dev/packages/ember-testing/lib/ext/rsvp.js',
-            './dist/dev/packages/ember-testing/lib/helpers.js',
-            './dist/dev/packages/ember-testing/lib/helpers/and_then.js',
-            './dist/dev/packages/ember-testing/lib/helpers/current_path.js',
-            './dist/dev/packages/ember-testing/lib/helpers/current_route_name.js',
-            './dist/dev/packages/ember-testing/lib/helpers/current_url.js',
-            './dist/dev/packages/ember-testing/lib/helpers/pause_test.js',
-            './dist/dev/packages/ember-testing/lib/helpers/visit.js',
-            './dist/dev/packages/ember-testing/lib/helpers/wait.js',
-            './dist/dev/packages/ember-testing/lib/initializers.js',
             './dist/dev/packages/ember-testing/lib/public-api.js',
-            './dist/dev/packages/ember-testing/lib/setup_for_testing.js',
             './dist/dev/packages/ember-testing/lib/test.js',
             './dist/dev/packages/ember-testing/lib/test/adapter.js',
-            './dist/dev/packages/ember-testing/lib/test/helpers.js',
-            './dist/dev/packages/ember-testing/lib/test/on_inject_helpers.js',
             './dist/dev/packages/ember-testing/lib/test/pending_requests.js',
-            './dist/dev/packages/ember-testing/lib/test/promise.js',
-            './dist/dev/packages/ember-testing/lib/test/run.js',
             './dist/dev/packages/ember-testing/lib/test/waiters.js',
           ].map((x) => (isProduction ? x.replace('/dist/dev/', '/dist/prod/') : x)),
         };

package.json

@@ -335,30 +335,13 @@
       "@simple-dom/document/index.js": "ember-source/@simple-dom/document/index.js",
       "backburner.js/index.js": "ember-source/backburner.js/index.js",
       "dag-map/index.js": "ember-source/dag-map/index.js",
-      "ember-template-compiler/index.js": "ember-source/ember-template-compiler/index.js",
       "ember-testing/index.js": "ember-source/ember-testing/index.js",
       "ember-testing/lib/adapters/adapter.js": "ember-source/ember-testing/lib/adapters/adapter.js",
-      "ember-testing/lib/adapters/qunit.js": "ember-source/ember-testing/lib/adapters/qunit.js",
-      "ember-testing/lib/ext/application.js": "ember-source/ember-testing/lib/ext/application.js",
-      "ember-testing/lib/ext/rsvp.js": "ember-source/ember-testing/lib/ext/rsvp.js",
-      "ember-testing/lib/helpers.js": "ember-source/ember-testing/lib/helpers.js",
-      "ember-testing/lib/helpers/and_then.js": "ember-source/ember-testing/lib/helpers/and_then.js",
-      "ember-testing/lib/helpers/current_path.js": "ember-source/ember-testing/lib/helpers/current_path.js",
-      "ember-testing/lib/helpers/current_route_name.js": "ember-source/ember-testing/lib/helpers/current_route_name.js",
-      "ember-testing/lib/helpers/current_url.js": "ember-source/ember-testing/lib/helpers/current_url.js",
-      "ember-testing/lib/helpers/pause_test.js": "ember-source/ember-testing/lib/helpers/pause_test.js",
-      "ember-testing/lib/helpers/visit.js": "ember-source/ember-testing/lib/helpers/visit.js",
-      "ember-testing/lib/helpers/wait.js": "ember-source/ember-testing/lib/helpers/wait.js",
-      "ember-testing/lib/initializers.js": "ember-source/ember-testing/lib/initializers.js",
       "ember-testing/lib/public-api.js": "ember-source/ember-testing/lib/public-api.js",
-      "ember-testing/lib/setup_for_testing.js": "ember-source/ember-testing/lib/setup_for_testing.js",
       "ember-testing/lib/test.js": "ember-source/ember-testing/lib/test.js",
       "ember-testing/lib/test/adapter.js": "ember-source/ember-testing/lib/test/adapter.js",
       "ember-testing/lib/test/helpers.js": "ember-source/ember-testing/lib/test/helpers.js",
-      "ember-testing/lib/test/on_inject_helpers.js": "ember-source/ember-testing/lib/test/on_inject_helpers.js",
       "ember-testing/lib/test/pending_requests.js": "ember-source/ember-testing/lib/test/pending_requests.js",
-      "ember-testing/lib/test/promise.js": "ember-source/ember-testing/lib/test/promise.js",
-      "ember-testing/lib/test/run.js": "ember-source/ember-testing/lib/test/run.js",
       "ember-testing/lib/test/waiters.js": "ember-source/ember-testing/lib/test/waiters.js",
       "ember/barrel.js": "ember-source/ember/barrel.js",
       "ember/index.js": "ember-source/ember/index.js",

packages/@ember/routing/none-location.ts

@@ -13,8 +13,7 @@ import type { default as EmberLocation, UpdateCallback } from '@ember/routing/lo
   application in a larger page).
 
   Using `NoneLocation` causes Ember to not store the applications URL state
-  in the actual URL. This is generally used for testing purposes, and is one
-  of the changes made when calling `App.setupForTesting()`.
+  in the actual URL. This is generally used for testing purposes.
 
   @class NoneLocation
   @extends EmberObject

packages/@ember/test/index.ts

@@ -1,28 +1,19 @@
 import type * as EmberTesting from 'ember-testing';
 
-export let registerAsyncHelper: (typeof EmberTesting.Test)['registerAsyncHelper'];
-export let registerHelper: (typeof EmberTesting.Test)['registerHelper'];
 export let registerWaiter: (typeof EmberTesting.Test)['registerWaiter'];
-export let unregisterHelper: (typeof EmberTesting.Test)['unregisterHelper'];
 export let unregisterWaiter: (typeof EmberTesting.Test)['unregisterWaiter'];
 export let _impl: typeof EmberTesting | undefined;
 
 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;
 
 export function registerTestImplementation(impl: typeof EmberTesting) {
   let { Test } = impl;
-  registerAsyncHelper = Test.registerAsyncHelper;
-  registerHelper = Test.registerHelper;
   registerWaiter = Test.registerWaiter;
-  unregisterHelper = Test.unregisterHelper;
   unregisterWaiter = Test.unregisterWaiter;
   _impl = impl;
 }