A platform for community discussion. Free, open, simple.
DEV: Throw theme load errors in test environments (#38582)
David Taylore850da52b13a
diff --git a/frontend/discourse/app/app.js b/frontend/discourse/app/app.jsindex da05289858c..c480bdbb60b 100644--- a/frontend/discourse/app/app.js+++ b/frontend/discourse/app/app.js@@ -51,6 +51,11 @@ async function loadThemeFromModulePreload(link) {`Failed to load theme ${link.dataset.themeId} from ${link.href}`,String(error));++ if (DEBUG && (isRailsTesting() || isTesting())) {+ throw new Error(error);+ }+fireThemeErrorEvent({ themeId: link.dataset.themeId, error });}}diff --git a/frontend/discourse/app/initializers/discourse-bootstrap.js b/frontend/discourse/app/initializers/discourse-bootstrap.jsindex e7cb6863363..398471c04b0 100644--- a/frontend/discourse/app/initializers/discourse-bootstrap.js+++ b/frontend/discourse/app/initializers/discourse-bootstrap.js@@ -14,13 +14,8 @@ import I18n from "discourse-i18n";export default {// The very first initializer to runinitialize(app) {- const {- isDevelopment,- isProduction,- isTesting,- isRailsTesting,- setEnvironment,- } = environment;+ const { isDevelopment, isProduction, isTesting, isRailsTesting } =+ environment;setURLContainer(app.__container__);setDefaultOwner(app.__container__);@@ -58,7 +53,6 @@ export default {});setupURL(setupData.cdn, setupData.baseUrl, setupData.baseUri);- setEnvironment(setupData.environment);// the `if DEBUG` forces the code inside the conditional block to be tree-shaken in// production buildsdiff --git a/frontend/discourse/app/lib/environment.js b/frontend/discourse/app/lib/environment.jsindex c9be9392d97..a8b7553abc4 100644--- a/frontend/discourse/app/lib/environment.js+++ b/frontend/discourse/app/lib/environment.js@@ -2,7 +2,9 @@ import deprecated from "discourse/lib/deprecated";export const INPUT_DELAY = 250;-let environment = "unknown";+let environment =+ document.getElementById("data-discourse-setup")?.dataset.environment ||+ "unknown";export function setEnvironment(e) {environment = e;diff --git a/spec/system/blocks_spec.rb b/spec/system/blocks_spec.rbindex 273813220bd..0222aa69ecb 100644--- a/spec/system/blocks_spec.rb+++ b/spec/system/blocks_spec.rb@@ -8,6 +8,8 @@ describe "Block conditions", type: :system dothemeend+ after { Theme.clear_cache! }+fab!(:admin)fab!(:moderator)fab!(:trust_level_2_user) { Fabricate(:user, trust_level: TrustLevel[2]) }diff --git a/spec/system/dev_tools_spec.rb b/spec/system/dev_tools_spec.rbindex 3d3a0133bb6..8242cf79342 100644--- a/spec/system/dev_tools_spec.rb+++ b/spec/system/dev_tools_spec.rb@@ -67,6 +67,8 @@ describe "Discourse dev tools", type: :system dothemeend+ after { Theme.clear_cache! }+it "shows block visual overlay with tooltip" dovisit("/latest")toolbar.enable