From 3912a2dc248fc340db72b7c224f9765736fa2548 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Sat, 25 Nov 2023 18:09:36 +0100 Subject: [PATCH] DEV: Don't reload looping tests when cancelling (#24551) --- app/assets/javascripts/discourse/tests/setup-tests.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/tests/setup-tests.js b/app/assets/javascripts/discourse/tests/setup-tests.js index 745969cd5a7..41015f11e31 100644 --- a/app/assets/javascripts/discourse/tests/setup-tests.js +++ b/app/assets/javascripts/discourse/tests/setup-tests.js @@ -50,6 +50,7 @@ import { loadSprites } from "../lib/svg-sprite-loader"; const Plugin = $.fn.modal; const Modal = Plugin.Constructor; +let cancelled = false; function AcceptanceModal(option, _relatedTarget) { return this.each(function () { @@ -186,6 +187,7 @@ function setupToolbar() { } if (["INPUT", "SELECT", "LABEL"].includes(target.tagName)) { + cancelled = true; document.querySelector("#qunit-abort-tests-button")?.click(); } }); @@ -364,7 +366,7 @@ export default function setupTests(config) { if (getUrlParameter("loop")) { QUnit.done(({ failed }) => { - if (failed === 0) { + if (failed === 0 && !cancelled) { window.location.reload(); } });