github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-01 04:13:53 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

REFACTOR: Remove Discourse.HighlightJSPath from globals

Browse Source 
Instead we use the session, and pass that along where necessary.
This commit is contained in:
Robin Ward
2020-08-17 15:44:39 -04:00
parent 3745f2bb86
commit 5b2c306bb8
7 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/javascripts/components/highlighted-code-test.js
View File

@ -8,7 +8,7 @@ componentTest("highlighting code", {
template: "{{highlighted-code lang='ruby' code=code}}",
beforeEach() {
Discourse.HighlightJSPath =
this.session.highlightJsPath =
"assets/highlightjs/highlight-test-bundle.min.js";
this.set("code", "def test; end");
},
@ -27,7 +27,7 @@ componentTest("large code blocks are not highlighted", {
template: "{{highlighted-code lang='ruby' code=code}}",
beforeEach() {
Discourse.HighlightJSPath =
this.session.highlightJsPath =
"assets/highlightjs/highlight-test-bundle.min.js";
this.set("code", LONG_CODE_BLOCK);
},

6
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 Session from "discourse/models/session";
import { currentSettings } from "helpers/site-settings";
export default function(name, opts) {
@ -15,16 +16,21 @@ export default function(name, opts) {
test(name, function(assert) {
this.site = Site.current();
this.session = Session.current();
this.registry.register("site-settings:main", currentSettings(), {
instantiate: false
});
this.registry.register("capabilities:main", EmberObject);
this.registry.register("site:main", this.site, { instantiate: false });
this.registry.register("session:main", this.session, {
instantiate: false
});
this.registry.injection("component", "siteSettings", "site-settings:main");
this.registry.injection("component", "appEvents", "service:app-events");
this.registry.injection("component", "capabilities", "capabilities:main");
this.registry.injection("component", "site", "site:main");
this.registry.injection("component", "session", "session:main");
this.siteSettings = currentSettings();
autoLoadModules(this.container, this.registry);