Revert "DEV: Support for running theme test with Ember CLI" (#15547)

This reverts commit ea84a82f77.

This is causing problems with `/theme-qunit` on legacy, non-ember-cli production sites. Reverting while we work on a fix

app/assets/javascripts/discourse-common/addon/lib/debounce.js

@@ -11,9 +11,7 @@ let testingFunc = isLegacyEmber() ? run : next;
 
 export default function () {
   if (isTesting()) {
-    // Don't include the time argument (in ms)
-    let args = [].slice.call(arguments, 0, -1);
-    return testingFunc.apply(void 0, args);
+    return testingFunc(...arguments);
   } else {
     return debounce(...arguments);
   }

app/assets/javascripts/discourse/ember-cli-build.js

@@ -37,66 +37,8 @@ module.exports = function (defaults) {
       // We don't use SRI in Rails. Disable here to match:
       enabled: false,
     },
-
-    "ember-cli-terser": {
-      enabled: true,
-      exclude: [
-        "**/test-*.js",
-        "**/core-tests*.js",
-        "**/highlightjs/*",
-        "**/javascripts/*",
-      ],
-    },
-
-    // We need to build tests in prod for theme tests
-    tests: true,
   });
 
-  // Patching a private method is not great, but there's no other way for us to tell
-  // Ember CLI that we want the tests alone in a package without helpers/fixtures, since
-  // we re-use those in the theme tests.
-  app._defaultPackager.packageApplicationTests = function (tree) {
-    let appTestTrees = []
-      .concat(
-        this.packageEmberCliInternalFiles(),
-        this.packageTestApplicationConfig(),
-        tree
-      )
-      .filter(Boolean);
-
-    appTestTrees = mergeTrees(appTestTrees, {
-      overwrite: true,
-      annotation: "TreeMerger (appTestTrees)",
-    });
-
-    let tests = concat(appTestTrees, {
-      inputFiles: [
-        "**/tests/acceptance/*.js",
-        "**/tests/integration/*.js",
-        "**tests/unit/*.js",
-      ],
-      headerFiles: ["vendor/ember-cli/tests-prefix.js"],
-      footerFiles: ["vendor/ember-cli/app-config.js"],
-      outputFile: "/assets/core-tests.js",
-      annotation: "Concat: Core Tests",
-      sourceMapConfig: false,
-    });
-
-    let testHelpers = concat(appTestTrees, {
-      inputFiles: [
-        "**/tests/test-boot-ember-cli.js",
-        "**/tests/helpers/**/*.js",
-        "**/tests/fixtures/**/*.js",
-        "**/tests/setup-tests.js",
-      ],
-      outputFile: "/assets/test-helpers.js",
-      annotation: "Concat: Test Helpers",
-      sourceMapConfig: false,
-    });
-
-    return mergeTrees([tests, testHelpers]);
-  };
-
   // WARNING: We should only import scripts here if they are not in NPM.
   // For example: our very specific version of bootstrap-modal.
   app.import(vendorJs + "bootbox.js");

app/assets/javascripts/discourse/package.json

@@ -34,7 +34,7 @@
     "discourse-common": "^1.0.0",
     "discourse-hbr": "^1.0.0",
     "discourse-widget-hbs": "^1.0.0",
-    "ember-auto-import": "^1.12.0",
+    "ember-auto-import": "^1.10.1",
     "ember-buffered-proxy": "^2.0.0-beta.0",
     "ember-cli": "~3.25.3",
     "ember-cli-app-version": "^4.0.0",

app/assets/javascripts/discourse/public/assets/scripts/discourse-test-listen-boot.js

@@ -1,4 +0,0 @@
-document.write(
-  "<style>#ember-testing-container { position: fixed; background: white; bottom: 0; right: 0; width: 640px; height: 384px; overflow: auto; z-index: 9999; border: 1px solid #ccc; transform: translateZ(0)} #ember-testing { width: 200%; height: 200%; transform: scale(0.5); transform-origin: top left; }</style>"
-);
-require('discourse/tests/test-boot-ember-cli');

app/assets/javascripts/discourse/tests/core_plugins_tests.js

@@ -1,3 +1,4 @@
 //= require_tree ./acceptance
 //= require_tree ./integration
 //= require_tree ./unit
+//= require ./plugin_tests

app/assets/javascripts/discourse/tests/index.html

@@ -50,14 +50,9 @@
     <script src="{{rootURL}}assets/test-support.js"></script>
     <script src="{{rootURL}}assets/discourse.js"></script>
     <script src="{{rootURL}}assets/discourse-markdown.js"></script>
-    <script src="{{rootURL}}assets/discourse/tests/active-plugins.js"></script>
+    <script src="{{rootURL}}assets/discourse/tests/core_plugins_tests.js"></script>
     <script src="{{rootURL}}assets/admin.js"></script>
-    <script src="{{rootURL}}assets/test-helpers.js"></script>
-    <script src="{{rootURL}}assets/core-tests.js"></script>
-    <script src="{{rootURL}}assets/discourse/tests/plugin-tests.js"></script>
-    <script>
-      require('discourse/tests/test-boot-ember-cli');
-    </script>
+    <script src="{{rootURL}}assets/tests.js"></script>
     <script src="{{rootURL}}assets/scripts/discourse-boot.js"></script>
 
     {{content-for "body-footer"}}

app/assets/javascripts/discourse/tests/plugin-tests.js.erb

@@ -1,10 +0,0 @@
-<%
-  Discourse.plugins.each do |p|
-    root_path = "#{File.dirname(p.path)}/test/javascripts"
-
-    to_glob = [root_path + '/**/**.es6']
-    to_glob << (root_path + '/**/**.js') if p.transpile_js
-
-    Dir.glob(to_glob) { |f| require_asset(f) }
-  end
-%>

app/assets/javascripts/discourse/tests/plugin_tests.js.erb

@@ -8,4 +8,13 @@
       require_asset(f)
     end
   end
+
+  Discourse.plugins.each do |p|
+    root_path = "#{File.dirname(p.path)}/test/javascripts"
+
+    to_glob = [root_path + '/**/**.es6']
+    to_glob << (root_path + '/**/**.js') if p.transpile_js
+
+    Dir.glob(to_glob) { |f| require_asset(f) }
+  end
 %>

app/assets/javascripts/discourse/tests/test-helper.js

@@ -34,4 +34,3 @@ document.addEventListener("discourse-booted", () => {
     setupEmberOnerrorValidation: !skippingCore,
   });
 });
-window.EmberENV.TESTS_FILE_LOADED = true;

app/assets/javascripts/discourse/tests/test_helper.js

@@ -0,0 +1,38 @@
+// discourse-skip-module
+
+//= require env
+//= require jquery.debug
+//= require jquery.ui.widget
+//= require ember.debug
+//= require message-bus
+//= require qunit
+//= require ember-qunit
+//= require fake_xml_http_request
+//= require route-recognizer
+//= require pretender
+//= require locales/i18n
+//= require locales/en
+//= require discourse-loader
+
+// Our base application
+//= require vendor
+//= require discourse-shims
+//= require markdown-it-bundle
+//= require application
+//= require admin
+
+// These are not loaded in prod or development
+// But we need them for testing handlebars templates in qunit
+//= require handlebars
+//= require ember-template-compiler
+
+// Test helpers
+//= require sinon
+//= require_tree ./helpers
+//= require break_string
+
+//= require_tree ./fixtures
+
+//= require ./setup-tests
+//= require test-shims
+//= require jquery.magnific-popup.min.js

app/assets/javascripts/discourse/tests/theme_qunit_helper.js

@@ -3,3 +3,4 @@
 //= require_tree ./helpers
 //= require_tree ./fixtures
 //= require ./setup-tests
+//= require test-shims

app/assets/javascripts/discourse/tests/theme_qunit_tests_vendor.js

@@ -5,10 +5,11 @@
 //= require fake_xml_http_request
 //= require route-recognizer
 //= require pretender
-//= require sinon
-//= require break_string
-//= require test-shims
-//= require jquery.magnific-popup.min.js
+
+// These are not loaded in prod or development
+// But we need them for testing handlebars templates in qunit
 //= require handlebars
 //= require ember-template-compiler
-//= require markdown-it-bundle
+
+//= require sinon
+//= require break_string

app/assets/javascripts/discourse/tests/theme_qunit_vendor.js

@@ -0,0 +1,30 @@
+// This bundle contains the same dependencies as app/assets/javascripts/vendor.js
+// minus ember_jquery.
+// ember_jquery doesn't work with theme tests in production because it
+// contains production builds of Ember and jQuery, so we have a separate bundle
+// caled theme_qunit_ember_jquery which contains a debug build for Ember and jQuery.
+// We don't put theme_qunit_ember_jquery in this bundle because it would make the
+// bundle too big and cause OOM exceptions during rebuilds for self-hosters on
+// low-end machines.
+
+//= require logster
+
+//= require template_include.js
+
+//= require message-bus
+//= require jquery.ui.widget.js
+//= require Markdown.Converter.js
+//= require bootbox.js
+//= require popper.js
+//= require bootstrap-modal.js
+//= require caret_position
+//= require jquery.sortable.js
+//= require lodash.js
+//= require itsatrap.js
+//= require rsvp.js
+//= require uppy.js
+//= require buffered-proxy
+//= require virtual-dom
+//= require virtual-dom-amd
+//= require discourse-shims
+//= require pretty-text-bundle

app/assets/javascripts/yarn.lock

@@ -4810,41 +4810,6 @@ ember-auto-import@^1.10.1, ember-auto-import@^1.5.3:
     walk-sync "^0.3.3"
     webpack "^4.43.0"
 
-ember-auto-import@^1.12.0:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-1.12.0.tgz#52246b04891090e2608244e65c4c6af7710df12b"
-  integrity sha512-fzMGnyHGfUNFHchpLbJ98Vs/c5H2wZBMR9r/XwW+WOWPisZDGLUPPyhJQsSREPoUQ+o8GvyLaD/rkrKqW8bmgw==
-  dependencies:
-    "@babel/core" "^7.1.6"
-    "@babel/preset-env" "^7.10.2"
-    "@babel/traverse" "^7.1.6"
-    "@babel/types" "^7.1.6"
-    "@embroider/core" "^0.33.0"
-    babel-core "^6.26.3"
-    babel-loader "^8.0.6"
-    babel-plugin-syntax-dynamic-import "^6.18.0"
-    babylon "^6.18.0"
-    broccoli-debug "^0.6.4"
-    broccoli-node-api "^1.7.0"
-    broccoli-plugin "^4.0.0"
-    broccoli-source "^3.0.0"
-    debug "^3.1.0"
-    ember-cli-babel "^7.0.0"
-    enhanced-resolve "^4.0.0"
-    fs-extra "^6.0.1"
-    fs-tree-diff "^2.0.0"
-    handlebars "^4.3.1"
-    js-string-escape "^1.0.1"
-    lodash "^4.17.19"
-    mkdirp "^0.5.1"
-    resolve-package-path "^3.1.0"
-    rimraf "^2.6.2"
-    semver "^7.3.4"
-    symlink-or-copy "^1.2.0"
-    typescript-memoize "^1.0.0-alpha.3"
-    walk-sync "^0.3.3"
-    webpack "^4.43.0"
-
 ember-buffered-proxy@^2.0.0-beta.0:
   version "2.0.0-beta.0"
   resolved "https://registry.yarnpkg.com/ember-buffered-proxy/-/ember-buffered-proxy-2.0.0-beta.0.tgz#65be4e2d0dcf40a5a2dab548c84a21aa332555a2"