From 71e747b1609306299feff815e9805c91343151e4 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 24 Aug 2020 16:46:13 -0400
Subject: [PATCH] FIX: QUnit site has to be set before `reset()`

---
 test/javascripts/helpers/qunit-helpers.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/javascripts/helpers/qunit-helpers.js b/test/javascripts/helpers/qunit-helpers.js
index 7d1018beb3..c51cec6f62 100644
--- a/test/javascripts/helpers/qunit-helpers.js
+++ b/test/javascripts/helpers/qunit-helpers.js
@@ -170,15 +170,15 @@ export function acceptance(name, options) {
       clearHTMLCache();
       resetPluginApi();
 
+      if (options.site) {
+        resetSite(currentSettings(), options.site);
+      }
+
       Discourse.reset();
       this.container = getOwner(this);
       setURLContainer(this.container);
       setDefaultOwner(this.container);
 
-      if (options.site) {
-        resetSite(currentSettings(), options.site);
-      }
-
       if (options.beforeEach) {
         options.beforeEach.call(this);
       }