mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
REFACTOR: Remove container from DiscourseURL
This commit is contained in:
@@ -28,6 +28,7 @@ import { mapRoutes } from "discourse/mapping-router";
|
||||
import { currentSettings, mergeSettings } from "helpers/site-settings";
|
||||
import { getOwner } from "discourse-common/lib/get-owner";
|
||||
import { setTopicList } from "discourse/lib/topic-list-tracker";
|
||||
import { setURLContainer } from "discourse/lib/url";
|
||||
|
||||
export function currentUser() {
|
||||
return User.create(sessionFixtures["/session/current.json"].current_user);
|
||||
@@ -174,6 +175,7 @@ export function acceptance(name, options) {
|
||||
Discourse.reset();
|
||||
this.container = getOwner(this);
|
||||
setPluginContainer(this.container);
|
||||
setURLContainer(this.container);
|
||||
if (options.beforeEach) {
|
||||
options.beforeEach.call(this);
|
||||
}
|
||||
@@ -202,6 +204,7 @@ export function acceptance(name, options) {
|
||||
resetCustomPostMessageCallbacks();
|
||||
setTopicList(null);
|
||||
_clearSnapshots();
|
||||
setURLContainer(null);
|
||||
Discourse._runInitializer(
|
||||
"instanceInitializers",
|
||||
(initName, initializer) => {
|
||||
|
||||
@@ -165,7 +165,10 @@ QUnit.testStart(function(ctx) {
|
||||
Session.resetCurrent();
|
||||
User.resetCurrent();
|
||||
resetSite(settings);
|
||||
createHelperContext({ siteSettings: settings });
|
||||
createHelperContext({
|
||||
siteSettings: settings,
|
||||
capabilities: {}
|
||||
});
|
||||
|
||||
_DiscourseURL.redirectedTo = null;
|
||||
_DiscourseURL.redirectTo = function(url) {
|
||||
|
||||
Reference in New Issue
Block a user