base_url in the relative url

matteosister · Jun 17, 2014 · ae6600c · ae6600c
1 parent 15b327c
commit ae6600c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Resources/coffee/ng-router.coffee b/Resources/coffee/ng-router.coffee
@@ -65,7 +65,7 @@ class cypress.NgRouter
             host = @findRoute(routeName)?.getHost()
             return "#{cypress.NgRouter.scheme}://#{host}#{cypress.NgRouter.baseUrl}#{path}"
         else
-            return path
+            return "#{cypress.NgRouter.baseUrl}#{path}"
 
     findRoute: (routeName) ->
         matchedRoute = null

diff --git a/Resources/public/ng-router.js b/Resources/public/ng-router.js
diff --git a/Resources/test/spec/ng-router.coffee b/Resources/test/spec/ng-router.coffee
@@ -110,7 +110,7 @@ describe 'cypress.NgRouter', ->
         expect(ngRouter.generateResourceUrl('test')).toBe('scheme://host/base_url/test/:id')
 
     it 'should generate a route by its name, without the absolute path', ->
-        expect(ngRouter.generateResourceUrl('test', false)).toBe('/test/:id')
+        expect(ngRouter.generateResourceUrl('test', false)).toBe('/base_url/test/:id')
 
     it 'should have a generateResourceUrl method', ->
         expect(ngRouter.generateResourceUrl).toBeDefined()