A platform for community discussion. Free, open, simple.
DEV: Remove dead QUnit lifecycle code (#45502)
Jarek Radoszc1ca30069d5c
diff --git a/frontend/discourse/tests/helpers/qunit-helpers.js b/frontend/discourse/tests/helpers/qunit-helpers.jsindex b43e692a04b..70f402ca6a4 100644--- a/frontend/discourse/tests/helpers/qunit-helpers.js+++ b/frontend/discourse/tests/helpers/qunit-helpers.js@@ -207,7 +207,7 @@ export function applyPretender(name, server, helper) {}// Add clean up code here to run after every test-export function testCleanup(container, app) {+export function testCleanup(app) {if (_initialized.has(QUnit.config.current.testId)) {if (!app) {app = getApplication();@@ -217,7 +217,7 @@ export function testCleanup(container, app) {});app._runInitializer("initializers", (_, initializer) => {- initializer.teardown?.(container);+ initializer.teardown?.();});}@@ -249,7 +249,6 @@ export function testCleanup(container, app) {clearDisabledDefaultKeyboardBindings();clearNavItems();setTopicList(null);- container?.lookup?.("service:composer-action-state")?.clear();_clearRegisteredActions();cleanUpComposerUploadHandler();cleanUpComposerUploadMarkdownResolver();diff --git a/frontend/discourse/tests/setup-tests.js b/frontend/discourse/tests/setup-tests.jsindex 3e0eeeac988..afaaf9b7ef2 100644--- a/frontend/discourse/tests/setup-tests.js+++ b/frontend/discourse/tests/setup-tests.js@@ -6,14 +6,12 @@ import "discourse/static/markdown-it";/* eslint-enable simple-import-sort/imports */import { ASYNC_OBSERVERS, SYNC_OBSERVERS } from "@ember/-internals/metal";-import { getOwner } from "@ember/owner";import { run } from "@ember/runloop";import {getSettledState,isSettled,pauseTest,setApplication,- setResolver,} from "@ember/test-helpers";import $ from "jquery";import "message-bus-client";@@ -35,7 +33,6 @@ import { resetCategoryCache } from "discourse/models/category";import Session from "discourse/models/session";import User from "discourse/models/user";import { disableCloaking } from "discourse/modifiers/post-stream-viewport-tracker";-import { buildResolver } from "discourse/resolver";import SiteSettingService from "discourse/services/site-settings";import { flushMap } from "discourse/services/store";import pretender, {@@ -71,7 +68,6 @@ function createApplication(config, settings) {const app = Application.create(config);setApplication(app);- setResolver(buildResolver("discourse").create({ namespace: app }));// Production's autoboot builds the ApplicationInstance before initializers run, and they// rely on its container. ember-qunit only builds one after booting the app, so build it@@ -320,7 +316,7 @@ export default async function setupTests(config) {});QUnit.testDone(function () {- testCleanup(getOwner(app), app);+ testCleanup(app);// A pending ceremony never settles in headless Chrome, so it would retain the appWebauthnAbortHandler.controller?.abort();@@ -396,10 +392,6 @@ export default async function setupTests(config) {app = null;});- if (getUrlParameter("qunit_disable_auto_start") === "1") {- QUnit.config.autostart = false;- }-if (getUrlParameter("loop")) {QUnit.done(({ failed }) => {if (failed === 0 && !cancelled) {diff --git a/frontend/discourse/tests/test-boot-ember-cli.js b/frontend/discourse/tests/test-boot-ember-cli.jsindex 0f9224c220b..30e6738b9ec 100644--- a/frontend/discourse/tests/test-boot-ember-cli.js+++ b/frontend/discourse/tests/test-boot-ember-cli.js@@ -118,7 +118,6 @@ export async function startTests() {startEmberExam({setupTestContainer: false,- setupEmberOnerrorValidation: testingCore,setupTestIsolationValidation: true,availableModules,});