Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Failing tests

This commit is contained in:
Robin Ward 2019-11-13 12:59:01 -05:00
parent 3d0b310368
commit f5ed0dc2e6
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/discourse.js.es6
View File

@ -61,11 +61,9 @@ const Discourse = Ember.Application.extend(FocusEvent, {
$("title").text(title); $("title").text(title);
} }
var displayCount = this.displayCount; let displayCount = this.displayCount;
var dynamicFavicon = this.currentUser let dynamicFavicon = this.currentUser && this.currentUser.dynamic_favicon;
? !this.currentUser.get("dynamic_favicon") if (displayCount > 0 && !dynamicFavicon) {
: false;
if (displayCount > 0 && dynamicFavicon) {
title = `(${displayCount}) ${title}`; title = `(${displayCount}) ${title}`;
} }

5
app/assets/javascripts/discourse/models/user.js.es6
View File

@ -853,6 +853,11 @@ User.reopenClass(Singleton, {
return null; return null;
}, },
resetCurrent(user) {
this._super(user);
Discourse.currentUser = user;
},
checkUsername(username, email, for_user_id) { checkUsername(username, email, for_user_id) {
return ajax(userPath("check_username"), { return ajax(userPath("check_username"), {
data: { username, email, for_user_id } data: { username, email, for_user_id }

1
test/javascripts/test_helper.js
View File

@ -124,7 +124,6 @@ QUnit.testStart(function(ctx) {
Session.resetCurrent(); Session.resetCurrent();
User.resetCurrent(); User.resetCurrent();
resetSite(Discourse.SiteSettings); resetSite(Discourse.SiteSettings);
Discourse.currentUser = User.current();
_DiscourseURL.redirectedTo = null; _DiscourseURL.redirectedTo = null;
_DiscourseURL.redirectTo = function(url) { _DiscourseURL.redirectTo = function(url) {