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

FIX: replace fullPath while rewriting the /my/ URLs.

Browse Source 
And added the tests. Follow-up to cdca5a2ee4
This commit is contained in:
Vinoth Kannan 2020-08-05 23:22:15 +05:30
parent 0c8365a1a2
commit aa017f276f
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/app/lib/url.js
View File

@ -247,7 +247,7 @@ const DiscourseURL = EmberObject.extend({
if (fullPath.indexOf(myPath) === 0) { if (fullPath.indexOf(myPath) === 0) {
const currentUser = User.current(); const currentUser = User.current();
if (currentUser) { if (currentUser) {
path = path.replace( path = fullPath.replace(
myPath, myPath,
userPath(currentUser.get("username_lower")) userPath(currentUser.get("username_lower"))
); );

15
test/javascripts/lib/url-test.js
View File

@ -1,5 +1,7 @@
import DiscourseURL, { userPath } from "discourse/lib/url"; import DiscourseURL, { userPath } from "discourse/lib/url";
import { setPrefix } from "discourse-common/lib/get-url"; import { setPrefix } from "discourse-common/lib/get-url";
import { logIn } from "helpers/qunit-helpers";
import User from "discourse/models/user";
QUnit.module("lib:url"); QUnit.module("lib:url");
@ -66,3 +68,16 @@ QUnit.test("userPath with prefix", assert => {
assert.equal(userPath("eviltrout"), "/forum/u/eviltrout"); assert.equal(userPath("eviltrout"), "/forum/u/eviltrout");
assert.equal(userPath("hp.json"), "/forum/u/hp.json"); assert.equal(userPath("hp.json"), "/forum/u/hp.json");
}); });
QUnit.test("routeTo with prefix", async assert => {
setPrefix("/forum");
logIn();
const user = User.current();
sandbox.stub(DiscourseURL, "handleURL");
DiscourseURL.routeTo("/my/messages");
assert.ok(
DiscourseURL.handleURL.calledWith(`/u/${user.username}/messages`),
"it should navigate to the messages page"
);
});