IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

REFACTOR: Remove less effective method of injecting siteSettings

Browse Source
This commit is contained in:
Robin Ward
2020-07-14 13:07:54 -04:00
parent ca13160435
commit a37a19b55c
8 changed files with 55 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/javascripts/helpers/component-test.js
View File

@@ -4,6 +4,7 @@ import { autoLoadModules } from "discourse/initializers/auto-load-modules";
import TopicTrackingState from "discourse/models/topic-tracking-state";
import User from "discourse/models/user";
import Site from "discourse/models/site";
import { currentSettings } from "helpers/site-settings";
export default function(name, opts) {
opts = opts || {};
@@ -15,7 +16,7 @@ export default function(name, opts) {
test(name, function(assert) {
this.site = Site.current();
this.registry.register("site-settings:main", Discourse.SiteSettings, {
this.registry.register("site-settings:main", currentSettings(), {
instantiate: false
});
this.registry.register("capabilities:main", EmberObject);
@@ -25,7 +26,7 @@ export default function(name, opts) {
this.registry.injection("component", "capabilities", "capabilities:main");
this.registry.injection("component", "site", "site:main");
this.siteSettings = Discourse.SiteSettings;
this.siteSettings = currentSettings();
autoLoadModules(this.registry, this.registry);