Merge pull request #77 from elnur/generate-absolute-fix

Fix absolute URLs not being generated when a scheme requirement is given

Author: willdurand

Resources/js/router.js

@@ -205,10 +205,8 @@ fos.Router.prototype.generate = function(name, opt_params, absolute) {
     }
 
     url = this.context_.base_url + url;
-    if (goog.object.containsKey(route.requirements, "_scheme")) {
-        if (this.getScheme() != route.requirements["_scheme"]) {
-            url = route.requirements["_scheme"] + "://" + this.getHost() + url;
-        }
+    if (goog.object.containsKey(route.requirements, "_scheme") && this.getScheme() != route.requirements["_scheme"]) {
+        url = route.requirements["_scheme"] + "://" + this.getHost() + url;
     } else if (absolute === true) {
         url = this.getScheme() + "://" + this.getHost() + url;
     }

Resources/js/router.test.js

@@ -60,6 +60,18 @@ function testGenerateUsesAbsoluteUrl() {
     assertEquals('http://localhost/foo/bar', router.generate('homepage', [], true));
 }
 
+function testGenerateUsesAbsoluteUrlWhenSchemeRequirementGiven() {
+    var router = new fos.Router({base_url: '/foo', host: "localhost", scheme: "http"}, {
+        homepage: {
+            tokens: [['text', '/bar']],
+            defaults: {},
+            requirements: {"_scheme": "http"}
+        }
+    });
+
+    assertEquals('http://localhost/foo/bar', router.generate('homepage', [], true));
+}
+
 function testGenerateWithOptionalTrailingParam() {
     var router = new fos.Router({base_url: ''}, {
         posts: {