github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-26 23:32:51 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #3735 from riking/patch-4

Browse Source 
FIX: Discourse.BaseUri should not default to /
This commit is contained in:
Robin Ward
2015-11-06 14:52:19 -05:00
parent b699d43b1b aca70805f1
commit 8ba7c06b7d
9 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,7 +98,7 @@ test("url", function() {
t = testClass.create({ username: 'eviltrout' });
equal(t.get('userUrl'), "/users/eviltrout", "it supports urls without a prefix");
Discourse.BaseUri = "/prefixed/";
Discourse.BaseUri = "/prefixed";
t = testClass.create({ username: 'eviltrout' });
equal(t.get('userUrl'), "/prefixed/users/eviltrout", "it supports urls with a prefix");
});

2
test/javascripts/test_helper.js
View File

@ -88,7 +88,7 @@ QUnit.testStart(function(ctx) {
// Allow our tests to change site settings and have them reset before the next test
Discourse.SiteSettings = dup(Discourse.SiteSettingsOriginal);
Discourse.BaseUri = "/";
Discourse.BaseUri = "";
Discourse.BaseUrl = "localhost";
Discourse.Session.resetCurrent();
Discourse.User.resetCurrent();