From 42f2a48defd7f096e839475aac62617e8eeb47f3 Mon Sep 17 00:00:00 2001 From: Vladislav Pilgasov Date: Tue, 13 Apr 2021 16:44:12 +0200 Subject: [PATCH 1/3] refactor: refactor construct url function by modifying just the necessary parts --- .../storyshots-puppeteer/src/__tests__/url.test.ts | 8 ++++---- addons/storyshots/storyshots-puppeteer/src/url.ts | 9 ++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/addons/storyshots/storyshots-puppeteer/src/__tests__/url.test.ts b/addons/storyshots/storyshots-puppeteer/src/__tests__/url.test.ts index d0f8ddbddf0..18d221bc9df 100644 --- a/addons/storyshots/storyshots-puppeteer/src/__tests__/url.test.ts +++ b/addons/storyshots/storyshots-puppeteer/src/__tests__/url.test.ts @@ -21,25 +21,25 @@ describe('Construct URL for Storyshots', () => { it('can use a url without path and with query params', () => { expect(constructUrl('http://localhost:9001?hello=world', id)).toEqual( - 'http://localhost:9001/iframe.html?id=somekind--somestory&hello=world' + 'http://localhost:9001/iframe.html?hello=world&id=somekind--somestory' ); }); it('can use a url without path (buth slash) and with query params', () => { expect(constructUrl('http://localhost:9001/?hello=world', id)).toEqual( - 'http://localhost:9001/iframe.html?id=somekind--somestory&hello=world' + 'http://localhost:9001/iframe.html?hello=world&id=somekind--somestory' ); }); it('can use a url with some path and query params', () => { expect(constructUrl('http://localhost:9001/nice-path?hello=world', id)).toEqual( - 'http://localhost:9001/nice-path/iframe.html?id=somekind--somestory&hello=world' + 'http://localhost:9001/nice-path/iframe.html?hello=world&id=somekind--somestory' ); }); it('can use a url with some path (slash) and query params', () => { expect(constructUrl('http://localhost:9001/nice-path/?hello=world', id)).toEqual( - 'http://localhost:9001/nice-path/iframe.html?id=somekind--somestory&hello=world' + 'http://localhost:9001/nice-path/iframe.html?hello=world&id=somekind--somestory' ); }); diff --git a/addons/storyshots/storyshots-puppeteer/src/url.ts b/addons/storyshots/storyshots-puppeteer/src/url.ts index f9f75a90cff..036fc76200c 100644 --- a/addons/storyshots/storyshots-puppeteer/src/url.ts +++ b/addons/storyshots/storyshots-puppeteer/src/url.ts @@ -1,9 +1,8 @@ import { URL } from 'url'; export const constructUrl = (storybookUrl: string, id: string) => { - const storyUrl = `/iframe.html?id=${id}`; - const { protocol, host, pathname, search } = new URL(storybookUrl); - const pname = pathname.replace(/\/$/, ''); // removes trailing / - const query = search.replace('?', '&'); // convert leading ? to & - return `${protocol}//${host}${pname}${storyUrl}${query}`; + const url = new URL(storybookUrl); + url.pathname = url.pathname.replace(/\/$/, '').concat('/iframe.html'); + url.searchParams.append('id', id); + return url.toString(); }; From 3432bb40c6244b30409bb0b98105977fd21936d3 Mon Sep 17 00:00:00 2001 From: Vladislav Pilgasov Date: Tue, 13 Apr 2021 16:45:02 +0200 Subject: [PATCH 2/3] test: add a test which covers username and password authentication --- .../storyshots-puppeteer/src/__tests__/url.test.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/addons/storyshots/storyshots-puppeteer/src/__tests__/url.test.ts b/addons/storyshots/storyshots-puppeteer/src/__tests__/url.test.ts index 18d221bc9df..10478eded29 100644 --- a/addons/storyshots/storyshots-puppeteer/src/__tests__/url.test.ts +++ b/addons/storyshots/storyshots-puppeteer/src/__tests__/url.test.ts @@ -43,6 +43,14 @@ describe('Construct URL for Storyshots', () => { ); }); + it('can use a url with username and password and query params', () => { + expect( + constructUrl('http://username:password@localhost:9001/nice-path/?hello=world', id) + ).toEqual( + 'http://username:password@localhost:9001/nice-path/iframe.html?hello=world&id=somekind--somestory' + ); + }); + it('can use a url with file protocol', () => { expect(constructUrl('file://users/storybook', id)).toEqual( 'file://users/storybook/iframe.html?id=somekind--somestory' From b2f0225e7fb25a42ae0a3e4152164809eb64d066 Mon Sep 17 00:00:00 2001 From: Vladislav Pilgasov Date: Tue, 13 Apr 2021 16:46:18 +0200 Subject: [PATCH 3/3] test: add a test which covers authentication with just a username --- .../storyshots-puppeteer/src/__tests__/url.test.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/addons/storyshots/storyshots-puppeteer/src/__tests__/url.test.ts b/addons/storyshots/storyshots-puppeteer/src/__tests__/url.test.ts index 10478eded29..cf36929dee6 100644 --- a/addons/storyshots/storyshots-puppeteer/src/__tests__/url.test.ts +++ b/addons/storyshots/storyshots-puppeteer/src/__tests__/url.test.ts @@ -51,6 +51,12 @@ describe('Construct URL for Storyshots', () => { ); }); + it('can use a url with username and query params', () => { + expect(constructUrl('http://username@localhost:9001/nice-path/?hello=world', id)).toEqual( + 'http://username@localhost:9001/nice-path/iframe.html?hello=world&id=somekind--somestory' + ); + }); + it('can use a url with file protocol', () => { expect(constructUrl('file://users/storybook', id)).toEqual( 'file://users/storybook/iframe.html?id=somekind--somestory'