Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: Don't resetSite() more often than needed (#13138) 

Avoid calling resetSite() twice per test in certain situations.

Included:
* DEV: Import `exists` helper
This commit is contained in:
Jarek Radosz 2021-05-25 18:38:41 +02:00 committed by GitHub
parent 51b360916c
commit 61cf34c09d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/discourse/tests/acceptance/group-test.js
View File

@ -1,6 +1,7 @@
import { import {
acceptance, acceptance,
count, count,
exists,
queryAll, queryAll,
} from "discourse/tests/helpers/qunit-helpers"; } from "discourse/tests/helpers/qunit-helpers";
import { click, visit } from "@ember/test-helpers"; import { click, visit } from "@ember/test-helpers";

1
app/assets/javascripts/discourse/tests/acceptance/topic-edit-timer-test.js
View File

@ -1,5 +1,6 @@
import { import {
acceptance, acceptance,
exists,
queryAll, queryAll,
updateCurrentUser, updateCurrentUser,
} from "discourse/tests/helpers/qunit-helpers"; } from "discourse/tests/helpers/qunit-helpers";

5
app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js
View File

@ -219,9 +219,7 @@ export function acceptance(name, optionsOrCallback) {
clearOutletCache(); clearOutletCache();
clearHTMLCache(); clearHTMLCache();
if (siteChanges) { resetSite(currentSettings(), siteChanges);
resetSite(currentSettings(), siteChanges);
}
if (LEGACY_ENV) { if (LEGACY_ENV) {
getApplication().__registeredObjects__ = false; getApplication().__registeredObjects__ = false;
@ -253,7 +251,6 @@ export function acceptance(name, optionsOrCallback) {
flushMap(); flushMap();
localStorage.clear(); localStorage.clear();
User.resetCurrent(); User.resetCurrent();
resetSite(currentSettings());
resetExtraClasses(); resetExtraClasses();
clearOutletCache(); clearOutletCache();
clearHTMLCache(); clearHTMLCache();