GitHub/storybook
1
0
Fork 0
mirror of https://github.com/storybookjs/storybook.git synced 2025-04-06 06:41:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14582 from avendiart/next

Browse Source 
Storyshots: Preserve authentication information in Storybook URL
This commit is contained in:
Michael Shilman 2021-04-14 12:50:53 +08:00 committed by GitHub
commit 6d9079f68f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
addons/storyshots/storyshots-puppeteer/src/__tests__/url.test.ts
View File

@ -21,25 +21,39 @@ describe('Construct URL for Storyshots', () => {
it('can use a url without path and with query params', () => { it('can use a url without path and with query params', () => {
expect(constructUrl('http://localhost:9001?hello=world', id)).toEqual( 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', () => { it('can use a url without path (buth slash) and with query params', () => {
expect(constructUrl('http://localhost:9001/?hello=world', id)).toEqual( 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', () => { it('can use a url with some path and query params', () => {
expect(constructUrl('http://localhost:9001/nice-path?hello=world', id)).toEqual( 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', () => { it('can use a url with some path (slash) and query params', () => {
expect(constructUrl('http://localhost:9001/nice-path/?hello=world', id)).toEqual( 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 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 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'
); );
}); });

9
addons/storyshots/storyshots-puppeteer/src/url.ts
View File

@ -1,9 +1,8 @@
import { URL } from 'url'; import { URL } from 'url';
export const constructUrl = (storybookUrl: string, id: string) => { export const constructUrl = (storybookUrl: string, id: string) => {
const storyUrl = `/iframe.html?id=${id}`; const url = new URL(storybookUrl);
const { protocol, host, pathname, search } = new URL(storybookUrl); url.pathname = url.pathname.replace(/\/$/, '').concat('/iframe.html');
const pname = pathname.replace(/\/$/, ''); // removes trailing / url.searchParams.append('id', id);
const query = search.replace('?', '&'); // convert leading ? to & return url.toString();
return `${protocol}//${host}${pname}${storyUrl}${query}`;
}; };