github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 22:43:33 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

REFACTOR: Remove Discourse.__container__ from tests

Browse Source
This commit is contained in:
Robin Ward
2020-07-28 13:07:33 -04:00
parent 81ab62c72a
commit 01a3fa1ca8
6 changed files with 51 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
test/javascripts/helpers/qunit-helpers.js
View File

@ -26,6 +26,7 @@ import { _clearSnapshots } from "select-kit/components/composer-actions";
import User from "discourse/models/user";
import { mapRoutes } from "discourse/mapping-router";
import { currentSettings, mergeSettings } from "helpers/site-settings";
import { getOwner } from "discourse-common/lib/get-owner";
export function currentUser() {
return User.create(sessionFixtures["/session/current.json"].current_user);
@ -120,6 +121,7 @@ export function controllerModule(name, args = {}) {
export function discourseModule(name, hooks) {
QUnit.module(name, {
beforeEach() {
this.container = getOwner(this);
this.siteSettings = currentSettings();
if (hooks && hooks.beforeEach) {
hooks.beforeEach.call(this);
@ -148,10 +150,6 @@ export function acceptance(name, options) {
HeaderComponent.reopen({ examineDockHeader: function() {} });
resetExtraClasses();
if (options.beforeEach) {
options.beforeEach.call(this);
}
if (options.mobileView) {
forceMobile();
}
@ -173,6 +171,10 @@ export function acceptance(name, options) {
clearHTMLCache();
resetPluginApi();
Discourse.reset();
this.container = getOwner(this);
if (options.beforeEach) {
options.beforeEach.call(this);
}
},
afterEach() {
@ -197,14 +199,14 @@ export function acceptance(name, options) {
resetOneboxCache();
resetCustomPostMessageCallbacks();
_clearSnapshots();
Discourse._runInitializer("instanceInitializers", function(
initName,
initializer
) {
if (initializer && initializer.teardown) {
initializer.teardown(Discourse.__container__);
Discourse._runInitializer(
"instanceInitializers",
(initName, initializer) => {
if (initializer && initializer.teardown) {
initializer.teardown(this.container);
}
}
});
);
Discourse.reset();
// We do this after reset so that the willClearRender will have already fired
@ -214,7 +216,7 @@ export function acceptance(name, options) {
}
export function controllerFor(controller, model) {
controller = Discourse.__container__.lookup("controller:" + controller);
controller = getOwner(this).lookup("controller:" + controller);
if (model) {
controller.set("model", model);
}