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

BUGFIX: clicking on links to the same domain was broken

Browse Source
This commit is contained in:
Régis Hanol
2014-01-29 11:31:36 +01:00
parent ecbcbf0a44
commit d0c55010aa
2 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
test/javascripts/lib/url_test.js
View File

@ -3,11 +3,11 @@ module("Discourse.URL");
test("isInternal with a HTTP url", function() {
this.stub(Discourse.URL, "origin").returns("http://eviltrout.com");
ok(!Discourse.URL.isInternal(null), "a blank URL is not internal");
not(Discourse.URL.isInternal(null), "a blank URL is not internal");
ok(Discourse.URL.isInternal("/test"), "relative URLs are internal");
ok(Discourse.URL.isInternal("http://eviltrout.com/tophat"), "a url on the same host is internal");
ok(Discourse.URL.isInternal("https://eviltrout.com/moustache"), "a url on a HTTPS of the same host is internal");
ok(!Discourse.URL.isInternal("http://twitter.com"), "a different host is not internal");
not(Discourse.URL.isInternal("http://twitter.com"), "a different host is not internal");
});
test("isInternal with a HTTPS url", function() {
@ -15,6 +15,19 @@ test("isInternal with a HTTPS url", function() {
ok(Discourse.URL.isInternal("http://eviltrout.com/monocle"), "HTTPS urls match HTTP urls");
});
// --------------------------------------------
// I DON'T KNOW WHY THIS BREAKS OTHER TESTS :(
// --------------------------------------------
// test("routeTo", function() {
// this.stub(Discourse.URL, "handleURL", function (path) { return path === "/t/topic-title/42"; });
// ok(Discourse.URL.routeTo("https://discourse.org/t/topic-title/42"), "can route HTTPS");
// ok(Discourse.URL.routeTo("http://discourse.org/t/topic-title/42"), "can route HTTP");
// ok(Discourse.URL.routeTo("//discourse.org/t/topic-title/42"), "can route schemaless");
// ok(Discourse.URL.routeTo("/t/topic-title/42"), "can route relative");
// });
test("navigatedToHome", function() {
var fakeDiscoveryController = { send: function() { return true; } };
var mock = sinon.mock(fakeDiscoveryController);
@ -26,7 +39,7 @@ test("navigatedToHome", function() {
var homepage = "/" + Discourse.Utilities.defaultHomepage();
ok(Discourse.URL.navigatedToHome(homepage, "/"));
ok(!Discourse.URL.navigatedToHome("/old", "/new"));
not(Discourse.URL.navigatedToHome("/old", "/new"));
// make sure we called the .refresh() method
mock.verify();