mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
REFACTOR: Allow helpers to access site settings
Since `Discourse.SiteSettings` is removed, helpers can now include and call `helperContext().siteSettings` to get access to the settings without using a global variable.
This commit is contained in:
@@ -43,6 +43,8 @@
|
||||
//= require jquery.magnific-popup.min.js
|
||||
|
||||
let resetSettings = require("helpers/site-settings").resetSettings;
|
||||
let createHelperContext = require("discourse-common/lib/helpers")
|
||||
.createHelperContext;
|
||||
|
||||
const buildResolver = require("discourse-common/resolver").buildResolver;
|
||||
window.setResolver(buildResolver("discourse").create({ namespace: Discourse }));
|
||||
@@ -106,7 +108,7 @@ function resetSite(siteSettings, extras) {
|
||||
}
|
||||
|
||||
QUnit.testStart(function(ctx) {
|
||||
resetSettings();
|
||||
let settings = resetSettings();
|
||||
server = createPretender.default;
|
||||
createPretender.applyDefaultHandlers(server);
|
||||
server.handlers = [];
|
||||
@@ -152,8 +154,6 @@ QUnit.testStart(function(ctx) {
|
||||
);
|
||||
}
|
||||
|
||||
resetSettings();
|
||||
|
||||
let getURL = require("discourse-common/lib/get-url");
|
||||
getURL.setupURL(null, "http://localhost:3000", "");
|
||||
getURL.setupS3CDN(null, null);
|
||||
@@ -162,7 +162,8 @@ QUnit.testStart(function(ctx) {
|
||||
let Session = require("discourse/models/session").default;
|
||||
Session.resetCurrent();
|
||||
User.resetCurrent();
|
||||
resetSite(Discourse.SiteSettings);
|
||||
resetSite(settings);
|
||||
createHelperContext(settings);
|
||||
|
||||
_DiscourseURL.redirectedTo = null;
|
||||
_DiscourseURL.redirectTo = function(url) {
|
||||
|
||||
Reference in New Issue
Block a user