fix(route-id): Fixing generation of route ids

Author: Christoph Bühler

src/core/routes/GiuseppeBaseRoute.ts

@@ -74,7 +74,7 @@ export class GiuseppeBaseRoute implements RouteDefinition {
     ): GiuseppeRoute[] {
         return [
             {
-                id: `${HttpMethod[this.httpMethod]}_${baseUrl}_${this.route}`,
+                id: `${HttpMethod[this.httpMethod]}_${UrlHelper.buildUrl(baseUrl, this.route)}`,
                 name: this.name,
                 method: this.httpMethod,
                 url: UrlHelper.buildUrl(baseUrl, this.route),

test/__snapshots__/Giuseppe.spec.ts.snap

@@ -53,4 +53,4 @@ Array [
 ]
 `;
 
-exports[`Giuseppe Core configureRouter() should throw on a duplicate route 1`] = `"A route with the ID 'get_baseUrl_getFunc' (method name: 'func2', url: 'baseUrl/getFunc') is already registered."`;
+exports[`Giuseppe Core configureRouter() should throw on a duplicate route 1`] = `"A route with the ID 'get_baseUrl/getFunc' (method name: 'func2', url: 'baseUrl/getFunc') is already registered."`;

test/core/controller/CoreController.spec.ts

@@ -106,7 +106,7 @@ describe('Core controller', () => {
 
             const ctrl = Giuseppe.registrar.controller[0];
             const route = ctrl.createRoutes('')[0];
-            expect(route.id).toBe('get__');
+            expect(route.id).toBe('get_');
             expect(route.name).toBe('get');
         });
 
@@ -127,15 +127,15 @@ describe('Core controller', () => {
             const routes = ctrl.createRoutes('');
 
             let route = routes[0];
-            expect(route.id).toBe('get_api_foobar');
+            expect(route.id).toBe('get_api/foobar');
             expect(route.url).toBe('api/foobar');
 
             route = routes[1];
-            expect(route.id).toBe('get_api_/barfoo');
+            expect(route.id).toBe('get_api/barfoo');
             expect(route.url).toBe('api/barfoo');
 
             route = routes[2];
-            expect(route.id).toBe('get_api_/rootfoo');
+            expect(route.id).toBe('get_api/rootfoo');
             expect(route.url).toBe('api/rootfoo');
         });
 

test/core/routes/CoreRoutes.spec.ts

@@ -211,7 +211,7 @@ describe('Core routes', () => {
                     const route = meta.routes()[0];
                     const generated = route.createRoutes(meta, '', [])[0];
 
-                    expect(generated.id).toBe(`${run.name}__TheUrl`);
+                    expect(generated.id).toBe(`${run.name}_TheUrl`);
                 });
 
                 it('should use the correct name', () => {