REFACTOR: Move javascript tests inside discourse app

This is where they should be as far as ember is concerned. Note this is
a huge commit and we should be really careful everything continues to
work properly.

.eslintignore

@@ -10,8 +10,8 @@ lib/highlight_js/
 plugins/**/lib/javascripts/locale
 public/
 vendor/
-test/javascripts/test_helper.js
-test/javascripts/fixtures
-test/javascripts/helpers/assertions.js
+app/assets/javascripts/discourse/tests/test_helper.js
+app/assets/javascripts/discourse/tests/fixtures
+app/assets/javascripts/discourse/tests/helpers/assertions.js
 node_modules/
 dist/

.github/workflows/ci.yml

@@ -147,7 +147,7 @@ jobs:
 
       - name: ESLint (core)
         if: env.BUILD_TYPE == 'LINT' && env.TARGET == 'CORE'
-        run: yarn eslint --ext .js,.js.es6 --no-error-on-unmatched-pattern app/assets/javascripts test/javascripts
+        run: yarn eslint --ext .js,.js.es6 --no-error-on-unmatched-pattern app/assets/javascripts 
 
       - name: ESLint (core plugins)
         if: env.BUILD_TYPE == 'LINT' && env.TARGET == 'CORE'
@@ -164,7 +164,6 @@ jobs:
           yarn prettier --list-different \
             "app/assets/stylesheets/**/*.scss" \
             "app/assets/javascripts/**/*.{js,es6}" \
-            "test/javascripts/**/*.{js,es6}" \
             "plugins/**/assets/stylesheets/**/*.scss" \
             "plugins/**/assets/javascripts/**/*.{js,es6}"
 

.prettierignore

@@ -18,8 +18,8 @@ lib/highlight_js/
 plugins/**/lib/javascripts/locale
 public/
 vendor/
-test/javascripts/test_helper.js
-test/javascripts/fixtures
-test/javascripts/helpers/assertions.js
+app/assets/javascripts/discourse/tests/test_helper.js
+app/assets/javascripts/discourse/tests/fixtures
+app/assets/javascripts/discourse/tests/helpers/assertions.js
 node_modules/
 dist/

app/assets/javascripts/admin/tests/admin/integration/components/group-list-setting-test.js

@@ -1,6 +1,6 @@
 import EmberObject from "@ember/object";
-import selectKit from "helpers/select-kit-helper";
-import componentTest from "helpers/component-test";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+import componentTest from "discourse/tests/helpers/component-test";
 
 moduleForComponent("group-list", { integration: true });
 

app/assets/javascripts/admin/tests/admin/integration/components/themes-list-item-test.js

@@ -1,5 +1,5 @@
 import I18n from "I18n";
-import componentTest from "helpers/component-test";
+import componentTest from "discourse/tests/helpers/component-test";
 import Theme from "admin/models/theme";
 
 moduleForComponent("themes-list-item", { integration: true });

app/assets/javascripts/admin/tests/admin/integration/components/themes-list-test.js

@@ -1,5 +1,5 @@
 import I18n from "I18n";
-import componentTest from "helpers/component-test";
+import componentTest from "discourse/tests/helpers/component-test";
 import Theme, { THEMES, COMPONENTS } from "admin/models/theme";
 
 moduleForComponent("themes-list", { integration: true });

app/assets/javascripts/discourse-loader.js

@@ -1,12 +1,17 @@
 var define, requirejs;
 
 (function () {
-  var JS_MODULES = {};
-  var ALIASES = {
+  let JS_MODULES = {};
+  const ALIASES = {
     "ember-addons/ember-computed-decorators":
       "discourse-common/utils/decorators",
     "discourse/lib/raw-templates": "discourse-common/lib/raw-templates",
     "preload-store": "discourse/lib/preload-store",
+    "fixtures/user_fixtures": "discourse/tests/fixtures/user-fixtures",
+  };
+  const ALIAS_PREPEND = {
+    fixtures: "discourse/tests/",
+    helpers: "discourse/tests/",
   };
 
   // In future versions of ember we don't need this
@@ -299,11 +304,15 @@ var define, requirejs;
   }
 
   function transformForAliases(name) {
-    var alias = ALIASES[name];
+    let alias = ALIASES[name];
     if (!alias) {
-      return name;
+      let segment = name.split("/")[0];
+      let prepend = ALIAS_PREPEND[segment];
+      if (!prepend) {
+        return name;
+      }
+      alias = prepend + name;
     }
-
     deprecatedModule(name, alias);
     return alias;
   }

app/assets/javascripts/discourse/tests/acceptance/about-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 acceptance("About");
 
 QUnit.test("viewing", async (assert) => {

app/assets/javascripts/discourse/tests/acceptance/account-created-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 import PreloadStore from "discourse/lib/preload-store";
 
 acceptance("Account Created");

app/assets/javascripts/discourse/tests/acceptance/admin-emails-test.js

@@ -1,5 +1,5 @@
-import { acceptance } from "helpers/qunit-helpers";
-import pretender from "helpers/create-pretender";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import pretender from "discourse/tests/helpers/create-pretender";
 
 acceptance("Admin - Emails", { loggedIn: true });
 

app/assets/javascripts/discourse/tests/acceptance/admin-search-log-term-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 acceptance("Admin - Search Log Term", { loggedIn: true });
 
 QUnit.skip("show search log term details", async (assert) => {

app/assets/javascripts/discourse/tests/acceptance/admin-search-logs-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 acceptance("Admin - Search Logs", { loggedIn: true });
 
 QUnit.skip("show search logs", async (assert) => {

app/assets/javascripts/discourse/tests/acceptance/admin-site-settings-test.js

@@ -1,5 +1,5 @@
-import { acceptance } from "helpers/qunit-helpers";
-import siteSettingFixture from "fixtures/site_settings";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import siteSettingFixture from "discourse/tests/fixtures/site-settings";
 
 var titleOverride = undefined;
 

app/assets/javascripts/discourse/tests/acceptance/admin-site-text-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Admin - Site Texts", { loggedIn: true });
 

app/assets/javascripts/discourse/tests/acceptance/admin-suspend-user-test.js

@@ -1,5 +1,5 @@
-import selectKit from "helpers/select-kit-helper";
-import { acceptance } from "helpers/qunit-helpers";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Admin - Suspend User", {
   loggedIn: true,

app/assets/javascripts/discourse/tests/acceptance/admin-user-badges-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Admin - Users Badges", { loggedIn: true });
 

app/assets/javascripts/discourse/tests/acceptance/admin-user-emails-test.js

@@ -1,5 +1,5 @@
 import I18n from "I18n";
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Admin - User Emails", { loggedIn: true });
 

app/assets/javascripts/discourse/tests/acceptance/admin-user-index-test.js

@@ -1,6 +1,6 @@
-import selectKit from "helpers/select-kit-helper";
-import { acceptance } from "helpers/qunit-helpers";
-import pretender from "helpers/create-pretender";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import pretender from "discourse/tests/helpers/create-pretender";
 
 acceptance("Admin - User Index", {
   loggedIn: true,

app/assets/javascripts/discourse/tests/acceptance/admin-users-list-test.js

@@ -1,5 +1,5 @@
 import I18n from "I18n";
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Admin - Users List", { loggedIn: true });
 

app/assets/javascripts/discourse/tests/acceptance/admin-watched-words-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 acceptance("Admin - Watched Words", { loggedIn: true });
 
 QUnit.test("list words in groups", async (assert) => {

app/assets/javascripts/discourse/tests/acceptance/auth-complete-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 acceptance("Auth Complete", {
   beforeEach() {
     const node = document.createElement("meta");

app/assets/javascripts/discourse/tests/acceptance/badges-test.js

@@ -1,5 +1,5 @@
-import selectKit from "helpers/select-kit-helper";
-import { acceptance } from "helpers/qunit-helpers";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Badges", { loggedIn: true });
 

app/assets/javascripts/discourse/tests/acceptance/bookmarks-test.js

@@ -1,12 +1,13 @@
 import I18n from "I18n";
-import selectKit from "helpers/select-kit-helper";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
 import {
   acceptance,
   loggedInUser,
   acceptanceUseFakeClock,
-} from "helpers/qunit-helpers";
-import pretender from "helpers/create-pretender";
-import { parsePostData } from "helpers/create-pretender";
+} from "discourse/tests/helpers/qunit-helpers";
+import pretender, {
+  parsePostData,
+} from "discourse/tests/helpers/create-pretender";
 
 acceptance("Bookmarking", {
   loggedIn: true,

app/assets/javascripts/discourse/tests/acceptance/category-banner-test.js

@@ -1,5 +1,5 @@
-import { acceptance } from "helpers/qunit-helpers";
-import DiscoveryFixtures from "fixtures/discovery_fixtures";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import DiscoveryFixtures from "discourse/tests/fixtures/discovery-fixtures";
 
 acceptance("Category Banners", {
   pretend(server, helper) {

app/assets/javascripts/discourse/tests/acceptance/category-chooser-test.js

@@ -1,5 +1,5 @@
-import selectKit from "helpers/select-kit-helper";
-import { acceptance } from "helpers/qunit-helpers";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("CategoryChooser", {
   loggedIn: true,

app/assets/javascripts/discourse/tests/acceptance/category-edit-security-test.js

@@ -1,5 +1,5 @@
-import selectKit from "helpers/select-kit-helper";
-import { acceptance } from "helpers/qunit-helpers";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Category Edit - security", {
   loggedIn: true,

app/assets/javascripts/discourse/tests/acceptance/category-edit-test.js

@@ -1,6 +1,6 @@
-import selectKit from "helpers/select-kit-helper";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
 import DiscourseURL from "discourse/lib/url";
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Category Edit", {
   loggedIn: true,

app/assets/javascripts/discourse/tests/acceptance/click-track-test.js

@@ -1,5 +1,5 @@
-import pretender from "helpers/create-pretender";
-import { acceptance } from "helpers/qunit-helpers";
+import pretender from "discourse/tests/helpers/create-pretender";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Click Track", {});
 

app/assets/javascripts/discourse/tests/acceptance/composer-actions-test.js

@@ -1,6 +1,9 @@
 import I18n from "I18n";
-import selectKit from "helpers/select-kit-helper";
-import { acceptance, updateCurrentUser } from "helpers/qunit-helpers";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+import {
+  acceptance,
+  updateCurrentUser,
+} from "discourse/tests/helpers/qunit-helpers";
 import { _clearSnapshots } from "select-kit/components/composer-actions";
 import { toggleCheckDraftPopup } from "discourse/controllers/composer";
 import Draft from "discourse/models/draft";

app/assets/javascripts/discourse/tests/acceptance/composer-attachment-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 function setupPretender(server, helper) {
   server.post("/uploads/lookup-urls", () => {

app/assets/javascripts/discourse/tests/acceptance/composer-edit-conflict-test.js

@@ -1,6 +1,6 @@
 import I18n from "I18n";
-import { acceptance } from "helpers/qunit-helpers";
-import pretender from "helpers/create-pretender";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import pretender from "discourse/tests/helpers/create-pretender";
 
 acceptance("Composer - Edit conflict", {
   loggedIn: true,

app/assets/javascripts/discourse/tests/acceptance/composer-hyperlink-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Composer - Hyperlink", {
   loggedIn: true,

app/assets/javascripts/discourse/tests/acceptance/composer-onebox-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Composer - Onebox", {
   loggedIn: true,

app/assets/javascripts/discourse/tests/acceptance/composer-tags-test.js

@@ -1,6 +1,9 @@
 import Category from "discourse/models/category";
-import { acceptance, updateCurrentUser } from "helpers/qunit-helpers";
-import selectKit from "helpers/select-kit-helper";
+import {
+  acceptance,
+  updateCurrentUser,
+} from "discourse/tests/helpers/qunit-helpers";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
 
 acceptance("Composer - Tags", {
   loggedIn: true,

app/assets/javascripts/discourse/tests/acceptance/composer-test.js

@@ -1,7 +1,7 @@
 import I18n from "I18n";
 import { run } from "@ember/runloop";
-import selectKit from "helpers/select-kit-helper";
-import { acceptance } from "helpers/qunit-helpers";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { toggleCheckDraftPopup } from "discourse/controllers/composer";
 import Draft from "discourse/models/draft";
 import { Promise } from "rsvp";

app/assets/javascripts/discourse/tests/acceptance/composer-topic-links-test.js

@@ -1,4 +1,7 @@
-import { acceptance, updateCurrentUser } from "helpers/qunit-helpers";
+import {
+  acceptance,
+  updateCurrentUser,
+} from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Composer topic featured links", {
   loggedIn: true,

app/assets/javascripts/discourse/tests/acceptance/composer-uncategorized-test.js

@@ -1,5 +1,8 @@
-import selectKit from "helpers/select-kit-helper";
-import { acceptance, updateCurrentUser } from "helpers/qunit-helpers";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+import {
+  acceptance,
+  updateCurrentUser,
+} from "discourse/tests/helpers/qunit-helpers";
 
 acceptance(
   "Composer disabled, uncategorized not allowed when any topic_template present",

app/assets/javascripts/discourse/tests/acceptance/create-account-external-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Create Account - external auth", {
   beforeEach() {

app/assets/javascripts/discourse/tests/acceptance/create-account-user-fields-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Create Account - User Fields", {
   site: {

app/assets/javascripts/discourse/tests/acceptance/custom-html-set-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { setCustomHTML } from "discourse/helpers/custom-html";
 import PreloadStore from "discourse/lib/preload-store";
 

app/assets/javascripts/discourse/tests/acceptance/custom-html-template-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("CustomHTML template", {
   beforeEach() {

app/assets/javascripts/discourse/tests/acceptance/dashboard-test.js

@@ -1,5 +1,5 @@
-import selectKit from "helpers/select-kit-helper";
-import { acceptance } from "helpers/qunit-helpers";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Dashboard", {
   loggedIn: true,

app/assets/javascripts/discourse/tests/acceptance/email-notice-test.js

@@ -1,4 +1,7 @@
-import { acceptance, updateCurrentUser } from "helpers/qunit-helpers";
+import {
+  acceptance,
+  updateCurrentUser,
+} from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Email Disabled Banner", {
   loggedIn: true,

app/assets/javascripts/discourse/tests/acceptance/emoji-picker-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("EmojiPicker", {
   loggedIn: true,

app/assets/javascripts/discourse/tests/acceptance/emoji-test.js

@@ -1,5 +1,5 @@
 import { IMAGE_VERSION as v } from "pretty-text/emoji/version";
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Emoji", { loggedIn: true });
 

app/assets/javascripts/discourse/tests/acceptance/encoded-category-test.js

@@ -1,5 +1,5 @@
-import { acceptance } from "helpers/qunit-helpers";
-import DiscoveryFixtures from "fixtures/discovery_fixtures";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import DiscoveryFixtures from "discourse/tests/fixtures/discovery-fixtures";
 
 acceptance("Encoded Sub Category Discovery", {
   pretend(server, helper) {

app/assets/javascripts/discourse/tests/acceptance/enforce-second-factor-test.js

@@ -1,4 +1,7 @@
-import { acceptance, updateCurrentUser } from "helpers/qunit-helpers";
+import {
+  acceptance,
+  updateCurrentUser,
+} from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Enforce Second Factor", {
   loggedIn: true,

app/assets/javascripts/discourse/tests/acceptance/forgot-password-test.js

@@ -1,5 +1,5 @@
 import I18n from "I18n";
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 let userFound = false;
 

app/assets/javascripts/discourse/tests/acceptance/group-card-mobile-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 import DiscourseURL from "discourse/lib/url";
 
 acceptance("Group Card - Mobile", { mobileView: true });

app/assets/javascripts/discourse/tests/acceptance/group-card-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 import DiscourseURL from "discourse/lib/url";
 
 acceptance("Group Card");

app/assets/javascripts/discourse/tests/acceptance/group-index-test.js

@@ -1,5 +1,8 @@
 import I18n from "I18n";
-import { acceptance, updateCurrentUser } from "helpers/qunit-helpers";
+import {
+  acceptance,
+  updateCurrentUser,
+} from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Group Members");
 

app/assets/javascripts/discourse/tests/acceptance/group-manage-categories-test.js

@@ -1,4 +1,7 @@
-import { acceptance, updateCurrentUser } from "helpers/qunit-helpers";
+import {
+  acceptance,
+  updateCurrentUser,
+} from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Managing Group Category Notification Defaults");
 QUnit.test("As an anonymous user", async (assert) => {

app/assets/javascripts/discourse/tests/acceptance/group-manage-interaction-test.js

@@ -1,4 +1,7 @@
-import { acceptance, updateCurrentUser } from "helpers/qunit-helpers";
+import {
+  acceptance,
+  updateCurrentUser,
+} from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Managing Group Interaction Settings", {
   loggedIn: true,

app/assets/javascripts/discourse/tests/acceptance/group-manage-logs-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Group logs", {
   loggedIn: true,

app/assets/javascripts/discourse/tests/acceptance/group-manage-membership-test.js

@@ -1,5 +1,8 @@
-import { acceptance, updateCurrentUser } from "helpers/qunit-helpers";
-import selectKit from "helpers/select-kit-helper";
+import {
+  acceptance,
+  updateCurrentUser,
+} from "discourse/tests/helpers/qunit-helpers";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
 
 acceptance("Managing Group Membership", {
   loggedIn: true,

app/assets/javascripts/discourse/tests/acceptance/group-manage-profile-test.js

@@ -1,4 +1,7 @@
-import { acceptance, updateCurrentUser } from "helpers/qunit-helpers";
+import {
+  acceptance,
+  updateCurrentUser,
+} from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Managing Group Profile");
 QUnit.test("As an anonymous user", async (assert) => {

app/assets/javascripts/discourse/tests/acceptance/group-manage-tags-test.js

@@ -1,4 +1,7 @@
-import { acceptance, updateCurrentUser } from "helpers/qunit-helpers";
+import {
+  acceptance,
+  updateCurrentUser,
+} from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Managing Group Tag Notification Defaults");
 QUnit.test("As an anonymous user", async (assert) => {

app/assets/javascripts/discourse/tests/acceptance/group-requests-test.js

@@ -1,5 +1,5 @@
-import { acceptance } from "helpers/qunit-helpers";
-import { parsePostData } from "helpers/create-pretender";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { parsePostData } from "discourse/tests/helpers/create-pretender";
 
 let requests = [];
 

app/assets/javascripts/discourse/tests/acceptance/group-test.js

@@ -1,7 +1,7 @@
 import I18n from "I18n";
-import selectKit from "helpers/select-kit-helper";
-import { acceptance } from "helpers/qunit-helpers";
-import pretender from "helpers/create-pretender";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import pretender from "discourse/tests/helpers/create-pretender";
 
 let groupArgs = {
   settings: {

app/assets/javascripts/discourse/tests/acceptance/groups-index-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Groups");
 

app/assets/javascripts/discourse/tests/acceptance/groups-new-test.js

@@ -1,5 +1,5 @@
 import I18n from "I18n";
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("New Group");
 

app/assets/javascripts/discourse/tests/acceptance/hamburger-menu-test.js

@@ -1,4 +1,7 @@
-import { acceptance, updateCurrentUser } from "helpers/qunit-helpers";
+import {
+  acceptance,
+  updateCurrentUser,
+} from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Opening the hamburger menu with some reviewables", {
   loggedIn: true,

app/assets/javascripts/discourse/tests/acceptance/hashtags-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Category and Tag Hashtags", {
   loggedIn: true,

app/assets/javascripts/discourse/tests/acceptance/invite-accept-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 import PreloadStore from "discourse/lib/preload-store";
 
 acceptance("Invite Accept", {

app/assets/javascripts/discourse/tests/acceptance/invite-show-user-fields-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 import PreloadStore from "discourse/lib/preload-store";
 
 acceptance("Accept Invite - User Fields", {

app/assets/javascripts/discourse/tests/acceptance/jump-to-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Jump to", {
   loggedIn: true,

app/assets/javascripts/discourse/tests/acceptance/keyboard-shortcuts-test.js

@@ -1,5 +1,5 @@
-import { acceptance } from "helpers/qunit-helpers";
-import pretender from "helpers/create-pretender";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import pretender from "discourse/tests/helpers/create-pretender";
 
 acceptance("Keyboard Shortcuts", { loggedIn: true });
 

app/assets/javascripts/discourse/tests/acceptance/login-redirect-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Login redirect");
 QUnit.test("redirects login to default homepage", async function (assert) {

app/assets/javascripts/discourse/tests/acceptance/login-required-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Login Required", {
   settings: {

app/assets/javascripts/discourse/tests/acceptance/login-with-email-and-hide-email-address-taken-test.js

@@ -1,6 +1,6 @@
 import I18n from "I18n";
-import { acceptance } from "helpers/qunit-helpers";
-import pretender from "helpers/create-pretender";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import pretender from "discourse/tests/helpers/create-pretender";
 
 acceptance("Login with email - hide email address taken", {
   settings: {

app/assets/javascripts/discourse/tests/acceptance/login-with-email-and-no-social-logins-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Login with email - no social logins", {
   settings: {

app/assets/javascripts/discourse/tests/acceptance/login-with-email-disabled-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Login with email disabled", {
   settings: {

app/assets/javascripts/discourse/tests/acceptance/login-with-email-test.js

@@ -1,5 +1,5 @@
 import I18n from "I18n";
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 let userFound = false;
 

app/assets/javascripts/discourse/tests/acceptance/mobile-discovery-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 acceptance("Topic Discovery - Mobile", { mobileView: true });
 
 QUnit.test("Visit Discovery Pages", async (assert) => {

app/assets/javascripts/discourse/tests/acceptance/mobile-sign-in-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Signing In - Mobile", { mobileView: true });
 

app/assets/javascripts/discourse/tests/acceptance/mobile-users-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("User Directory - Mobile", { mobileView: true });
 

app/assets/javascripts/discourse/tests/acceptance/modal-test.js

@@ -1,6 +1,9 @@
 import I18n from "I18n";
 import { run } from "@ember/runloop";
-import { acceptance, controllerFor } from "helpers/qunit-helpers";
+import {
+  acceptance,
+  controllerFor,
+} from "discourse/tests/helpers/qunit-helpers";
 import showModal from "discourse/lib/show-modal";
 
 acceptance("Modal", {

app/assets/javascripts/discourse/tests/acceptance/new-message-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("New Message");
 

app/assets/javascripts/discourse/tests/acceptance/new-topic-test.js

@@ -1,5 +1,5 @@
-import selectKit from "helpers/select-kit-helper";
-import { acceptance } from "helpers/qunit-helpers";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("New Topic");
 

app/assets/javascripts/discourse/tests/acceptance/notifications-filter-test.js

@@ -1,5 +1,5 @@
-import { acceptance } from "helpers/qunit-helpers";
-import selectKit from "helpers/select-kit-helper";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
 
 acceptance("NotificationsFilter", {
   loggedIn: true,

app/assets/javascripts/discourse/tests/acceptance/page-publishing-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Page Publishing", {
   loggedIn: true,

app/assets/javascripts/discourse/tests/acceptance/password-reset-test.js

@@ -1,7 +1,7 @@
 import I18n from "I18n";
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 import PreloadStore from "discourse/lib/preload-store";
-import { parsePostData } from "helpers/create-pretender";
+import { parsePostData } from "discourse/tests/helpers/create-pretender";
 
 acceptance("Password Reset", {
   pretend(server, helper) {

app/assets/javascripts/discourse/tests/acceptance/personal-message-test.js

@@ -1,5 +1,5 @@
 import I18n from "I18n";
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Personal Message", {
   loggedIn: true,

app/assets/javascripts/discourse/tests/acceptance/plugin-keyboard-shortcut-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { withPluginApi } from "discourse/lib/plugin-api";
 import KeyboardShortcuts from "discourse/lib/keyboard-shortcuts";
 import KeyboardShortcutInitializer from "discourse/initializers/keyboard-shortcuts";

app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-connector-class-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { extraConnectorClass } from "discourse/lib/plugin-connectors";
 import { action } from "@ember/object";
 

app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-decorator-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { withPluginApi } from "discourse/lib/plugin-api";
 
 const PREFIX = "javascripts/single-test/connectors";

app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-multi-template-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { clearCache } from "discourse/lib/plugin-connectors";
 
 const HELLO = "javascripts/multi-test/connectors/user-profile-primary/hello";

app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-single-template-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 const CONNECTOR =
   "javascripts/single-test/connectors/user-profile-primary/hello";

app/assets/javascripts/discourse/tests/acceptance/post-admin-menu-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Post - Admin Menu Anonymous Users", { loggedIn: false });
 

app/assets/javascripts/discourse/tests/acceptance/preferences-test.js

@@ -1,6 +1,9 @@
 import I18n from "I18n";
-import { acceptance, updateCurrentUser } from "helpers/qunit-helpers";
-import selectKit from "helpers/select-kit-helper";
+import {
+  acceptance,
+  updateCurrentUser,
+} from "discourse/tests/helpers/qunit-helpers";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
 import User from "discourse/models/user";
 
 function preferencesPretender(server, helper) {

app/assets/javascripts/discourse/tests/acceptance/raw-plugin-outlet-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 import compile from "handlebars-compiler";
 import {
   addRawTemplate,

app/assets/javascripts/discourse/tests/acceptance/redirect-to-top-test.js

@@ -1,5 +1,8 @@
-import { acceptance, updateCurrentUser } from "helpers/qunit-helpers";
-import DiscoveryFixtures from "fixtures/discovery_fixtures";
+import {
+  acceptance,
+  updateCurrentUser,
+} from "discourse/tests/helpers/qunit-helpers";
+import DiscoveryFixtures from "discourse/tests/fixtures/discovery-fixtures";
 
 acceptance("Redirect to Top", {
   pretend(server, helper) {

app/assets/javascripts/discourse/tests/acceptance/reports-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Reports", {
   loggedIn: true,

app/assets/javascripts/discourse/tests/acceptance/review-test.js

@@ -1,5 +1,5 @@
-import selectKit from "helpers/select-kit-helper";
-import { acceptance } from "helpers/qunit-helpers";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Review", {
   loggedIn: true,

app/assets/javascripts/discourse/tests/acceptance/search-full-test.js

@@ -1,5 +1,9 @@
-import selectKit from "helpers/select-kit-helper";
-import { selectDate, acceptance, waitFor } from "helpers/qunit-helpers";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+import {
+  selectDate,
+  acceptance,
+  waitFor,
+} from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Search - Full Page", {
   settings: { tagging_enabled: true },

app/assets/javascripts/discourse/tests/acceptance/search-mobile-test.js

@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Search - Mobile", { mobileView: true });