From 0ae596fe5bf36e93a5b27283f09ed89598b1c5d0 Mon Sep 17 00:00:00 2001 From: Danilo Hoffmann Date: Fri, 28 Feb 2020 11:10:16 +0100 Subject: [PATCH] refactor: return new links in link-parser --- .../directives/server-html.directive.spec.ts | 22 +++++++++---------- .../content-view/content-view.helper.spec.ts | 2 +- src/app/core/utils/link-parser.spec.ts | 4 ++-- src/app/core/utils/link-parser.ts | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/app/core/directives/server-html.directive.spec.ts b/src/app/core/directives/server-html.directive.spec.ts index a06640c0d8..82768acae8 100644 --- a/src/app/core/directives/server-html.directive.spec.ts +++ b/src/app/core/directives/server-html.directive.spec.ts @@ -38,7 +38,7 @@ describe('Server Html Directive', () => { it('should transform the given links to routing links', () => { expect(element).toMatchInlineSnapshot(`
-
Produkt
+
Produkt
Google
Basket
@@ -80,16 +80,16 @@ describe('Server Html Directive', () => { it('should transform the given media object source to the correct source', () => { expect(element).toMatchInlineSnapshot(` -
- -
- `); +
+ +
+ `); }); }); diff --git a/src/app/core/models/content-view/content-view.helper.spec.ts b/src/app/core/models/content-view/content-view.helper.spec.ts index 8f7e43fda3..380dd7f5f5 100644 --- a/src/app/core/models/content-view/content-view.helper.spec.ts +++ b/src/app/core/models/content-view/content-view.helper.spec.ts @@ -9,7 +9,7 @@ describe('Content View Helper', () => { [ { input: 'route://category/Computers', expected: '/category/Computers' }, { input: 'route://category/Home-Entertainment.SmartHome', expected: '/category/Home-Entertainment.SmartHome' }, - { input: 'product://201807195@inSPIRED-inTRONICS', expected: '/product/201807195' }, + { input: 'product://201807195@inSPIRED-inTRONICS', expected: '/sku201807195' }, ], ({ input, expected }) => { it(`should transform ${input} to ${expected}`, () => { diff --git a/src/app/core/utils/link-parser.spec.ts b/src/app/core/utils/link-parser.spec.ts index 49c6c598e6..28f3ecc7e7 100644 --- a/src/app/core/utils/link-parser.spec.ts +++ b/src/app/core/utils/link-parser.spec.ts @@ -11,11 +11,11 @@ describe('Link Parser', () => { input: 'route://category/Home-Entertainment.SmartHome', output: '/category/Home-Entertainment.SmartHome', }, - { input: 'product://201807195@inSPIRED-inTRONICS', output: '/product/201807195' }, + { input: 'product://201807195@inSPIRED-inTRONICS', output: '/sku201807195' }, { input: 'http://google.de', output: 'http://google.de' }, { input: 'https://google.de', output: 'https://google.de' }, { input: 'page://mypage', output: '/page/mypage' }, - { input: 'category://Computers@inSPIRED-Computers', output: '/category/Computers' }, + { input: 'category://Computers@inSPIRED-Computers', output: '/catComputers' }, { input: '/product/ABC', output: '/product/ABC' }, { input: undefined, output: undefined }, ], diff --git a/src/app/core/utils/link-parser.ts b/src/app/core/utils/link-parser.ts index aad7840ba0..1663d6ca0b 100644 --- a/src/app/core/utils/link-parser.ts +++ b/src/app/core/utils/link-parser.ts @@ -9,11 +9,11 @@ export class LinkParser { case 'product': // TODO: for consistent product links it should have the default category in the route // TODO: use ProductRoutePipe - return `/product/${value}`; + return `/sku${value}`; case 'category': // TODO: the configuration parameter currently only works for first level categories // TODO: use CategoryRoutePipe - return `/category/${value}`; + return `/cat${value}`; case 'page': // CMS managed pages link return `/page/${value}`;