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

Convert server side paths to use /u/

Browse Source
This commit is contained in:
Robin Ward
2017-03-28 14:27:54 -04:00
parent 45a257815a
commit 14410b71fb
38 changed files with 82 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/javascripts/lib/computed-test.js.es6
View File

@@ -92,13 +92,13 @@ test("url", function() {
var t, testClass;
testClass = Em.Object.extend({
userUrl: url('username', "/users/%@")
userUrl: url('username', "/u/%@")
});
t = testClass.create({ username: 'eviltrout' });
equal(t.get('userUrl'), "/users/eviltrout", "it supports urls without a prefix");
equal(t.get('userUrl'), "/u/eviltrout", "it supports urls without a prefix");
Discourse.BaseUri = "/prefixed";
t = testClass.create({ username: 'eviltrout' });
equal(t.get('userUrl'), "/prefixed/users/eviltrout", "it supports urls with a prefix");
equal(t.get('userUrl'), "/prefixed/u/eviltrout", "it supports urls with a prefix");
});

4
test/javascripts/lib/discourse-test.js.es6
View File

@@ -3,5 +3,5 @@ module("lib:discourse");
test("getURL on subfolder install", function() {
Discourse.BaseUri = "/forum";
equal(Discourse.getURL("/"), "/forum/", "root url has subfolder");
equal(Discourse.getURL("/users/neil"), "/forum/users/neil", "relative url has subfolder");
});
equal(Discourse.getURL("/u/neil"), "/forum/u/neil", "relative url has subfolder");
});

4
test/javascripts/lib/pretty-text-test.js.es6
View File

@@ -130,8 +130,8 @@ test("Links", function() {
"<p>Here's a tweet:<br/><a href=\"https://twitter.com/evil_trout/status/345954894420787200\" class=\"onebox\" target=\"_blank\">https://twitter.com/evil_trout/status/345954894420787200</a></p>",
"It doesn't strip the new line.");
cooked("1. View @eviltrout's profile here: http://meta.discourse.org/users/eviltrout/activity<br/>next line.",
"<ol><li>View <span class=\"mention\">@eviltrout</span>'s profile here: <a href=\"http://meta.discourse.org/users/eviltrout/activity\">http://meta.discourse.org/users/eviltrout/activity</a><br>next line.</li></ol>",
cooked("1. View @eviltrout's profile here: http://meta.discourse.org/u/eviltrout/activity<br/>next line.",
"<ol><li>View <span class=\"mention\">@eviltrout</span>'s profile here: <a href=\"http://meta.discourse.org/u/eviltrout/activity\">http://meta.discourse.org/u/eviltrout/activity</a><br>next line.</li></ol>",
"allows autolinking within a list without inserting a paragraph.");
cooked("[3]: http://eviltrout.com", "", "It doesn't autolink markdown link references");