github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 22:43:33 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Fix some more deprecated Discourse.User and Discourse.Site

Browse Source
This commit is contained in:
Robin Ward
2019-11-13 12:35:19 -05:00
parent 4843414de6
commit 3d0b310368
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test/javascripts/helpers/qunit-helpers.js.es6
View File

@ -20,20 +20,19 @@ import { resetWidgetCleanCallbacks } from "discourse/components/mount-widget";
import { resetDecorators as resetPostCookedDecorators } from "discourse/widgets/post-cooked";
import { resetCache as resetOneboxCache } from "pretty-text/oneboxer";
import { resetCustomPostMessageCallbacks } from "discourse/controllers/topic";
import User from "discourse/models/user";
export function currentUser() {
return Discourse.User.create(
sessionFixtures["/session/current.json"].current_user
);
return User.create(sessionFixtures["/session/current.json"].current_user);
}
export function updateCurrentUser(properties) {
Discourse.User.current().setProperties(properties);
User.current().setProperties(properties);
}
// Note: do not use this in acceptance tests. Use `loggedIn: true` instead
export function logIn() {
Discourse.User.resetCurrent(currentUser());
User.resetCurrent(currentUser());
}
const Plugin = $.fn.modal;
@ -119,7 +118,7 @@ export function acceptance(name, options) {
}
flushMap();
localStorage.clear();
Discourse.User.resetCurrent();
User.resetCurrent();
resetSite(Discourse.SiteSettings);
resetExtraClasses();
clearOutletCache();