mirror of
https://github.com/discourse/discourse.git
synced 2025-05-28 22:27:49 +08:00
Remove Discourse
constant usage (#10470)
* REFACTOR: Get us closer to no `Discourse` constants in tests * REFACTOR: Remove `Discourse.currentUser` * REFACTOR: `prioritizeNameInUx` is really a helper and can use context * REFACTOR: Rename test * REFACTOR: Remove `Discourse.MarkdownItURL` and use session * REFACTOR: Remove unused `LetterAvatarVersion` * REFACTOR: Remove unused `Discourse.ThemeSettings` * REFACTOR: Remove unused CDN constants * REFACTOR: The `globalNotice` property doesn't exist anymore * REFACTOR: Remove `Discourse.__container__` from plugin api * REFACTOR: Consider `logout()` a helper and remove container.
This commit is contained in:
@ -5,7 +5,7 @@ import { later } from "@ember/runloop";
|
||||
import sessionFixtures from "fixtures/session-fixtures";
|
||||
import HeaderComponent from "discourse/components/site-header";
|
||||
import { forceMobile, resetMobile } from "discourse/lib/mobile";
|
||||
import { resetPluginApi } from "discourse/lib/plugin-api";
|
||||
import { resetPluginApi, setPluginContainer } from "discourse/lib/plugin-api";
|
||||
import {
|
||||
clearCache as clearOutletCache,
|
||||
resetExtraClasses
|
||||
@ -173,6 +173,7 @@ export function acceptance(name, options) {
|
||||
resetPluginApi();
|
||||
Discourse.reset();
|
||||
this.container = getOwner(this);
|
||||
setPluginContainer(this.container);
|
||||
if (options.beforeEach) {
|
||||
options.beforeEach.call(this);
|
||||
}
|
||||
|
@ -1,7 +1,7 @@
|
||||
import EmailLog from "admin/models/email-log";
|
||||
import { setPrefix } from "discourse-common/lib/get-url";
|
||||
|
||||
QUnit.module("Discourse.EmailLog");
|
||||
QUnit.module("model:email-log");
|
||||
|
||||
QUnit.test("create", assert => {
|
||||
assert.ok(EmailLog.create(), "it can be created without arguments");
|
||||
|
@ -42,12 +42,13 @@
|
||||
//
|
||||
//= require jquery.magnific-popup.min.js
|
||||
|
||||
let App = window.Discourse;
|
||||
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 }));
|
||||
window.setResolver(buildResolver("discourse").create({ namespace: App }));
|
||||
|
||||
sinon.config = {
|
||||
injectIntoThis: false,
|
||||
@ -71,10 +72,10 @@ d.write(
|
||||
"<style>#ember-testing-container { position: absolute; background: white; bottom: 0; right: 0; width: 640px; height: 384px; overflow: auto; z-index: 9999; border: 1px solid #ccc; } #ember-testing { zoom: 50%; }</style>"
|
||||
);
|
||||
|
||||
Discourse.rootElement = "#ember-testing";
|
||||
Discourse.setupForTesting();
|
||||
Discourse.injectTestHelpers();
|
||||
Discourse.start();
|
||||
App.rootElement = "#ember-testing";
|
||||
App.setupForTesting();
|
||||
App.injectTestHelpers();
|
||||
App.start();
|
||||
|
||||
// disable logster error reporting
|
||||
if (window.Logster) {
|
||||
|
Reference in New Issue
Block a user