cubetiq/verdaccio-ui
1
0
Fork 0
forked from sombochea/verdaccio-ui
Code Issues Pull Requests Releases Wiki Activity

Revert "fix(#300): correctly reference registry url from options" (#311)

Browse Source
This commit is contained in:
Priscila Oliveira 2019-11-24 20:17:28 +01:00 committed by GitHub
parent ee74474811
commit d955268c25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jest/jestEnvironment.js
View File

@ -1 +1 @@
jest.requireActual('babel/polyfill'); require.requireActual('babel/polyfill');

5
jest/setup.ts
View File

@ -7,13 +7,14 @@ import { configure } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16'; import Adapter from 'enzyme-adapter-react-16';
import { GlobalWithFetchMock } from 'jest-fetch-mock'; import { GlobalWithFetchMock } from 'jest-fetch-mock';
// @ts-ignore : Only a void function can be called with the 'new' keyword
configure({ adapter: new Adapter() }); configure({ adapter: new Adapter() });
// @ts-ignore : Property '__APP_VERSION__' does not exist on type 'Global'. // @ts-ignore : Property '__APP_VERSION__' does not exist on type 'Global'.
global.__APP_VERSION__ = '1.0.0'; global.__APP_VERSION__ = '1.0.0';
// @ts-ignore : Property '__VERDACCIO_BASENAME_UI_OPTIONS' does not exist on type 'Global'. // @ts-ignore : Property '__VERDACCIO_BASENAME_UI_OPTIONS' does not exist on type 'Global'.
global.__VERDACCIO_BASENAME_UI_OPTIONS = { base: 'http://localhost' }; global.__VERDACCIO_BASENAME_UI_OPTIONS = {};
// @ts-ignore : Property 'VERDACCIO_API_URL' does not exist on type 'Global'.
global.VERDACCIO_API_URL = 'https://verdaccio.tld'; global.VERDACCIO_API_URL = 'https://verdaccio.tld';
const customGlobal: GlobalWithFetchMock = global as GlobalWithFetchMock; const customGlobal: GlobalWithFetchMock = global as GlobalWithFetchMock;

10
src/utils/url.test.ts
View File

@ -17,18 +17,14 @@ describe('utils', () => {
expect(isEmail('')).toBeFalsy(); expect(isEmail('')).toBeFalsy();
}); });
test('getRegistryURL() - should not change when location change', () => { test('getRegistryURL() - should keep slash if location is a sub directory', () => {
expect(getRegistryURL()).toBe('http://localhost');
history.pushState({}, 'page title', '/-/web/detail'); history.pushState({}, 'page title', '/-/web/detail');
expect(getRegistryURL()).toBe('http://localhost'); expect(getRegistryURL()).toBe('http://localhost/-/web/detail');
history.pushState({}, 'page title', '/'); history.pushState({}, 'page title', '/');
}); });
test('getRegistryURL() - should change when UI options change', () => { test('getRegistryURL() - should not add slash if location is not a sub directory', () => {
expect(getRegistryURL()).toBe('http://localhost'); expect(getRegistryURL()).toBe('http://localhost');
window.__VERDACCIO_BASENAME_UI_OPTIONS.base = 'http://localhost/test';
expect(getRegistryURL()).toBe('http://localhost/test');
window.__VERDACCIO_BASENAME_UI_OPTIONS.base = 'http://localhost';
}); });
}); });

3
src/utils/url.ts
View File

@ -15,7 +15,8 @@ export function isEmail(email: string): boolean {
} }
export function getRegistryURL(): string { export function getRegistryURL(): string {
return window.__VERDACCIO_BASENAME_UI_OPTIONS.base; // Don't add slash if it's not a sub directory
return `${location.origin}${location.pathname === '/' ? '' : location.pathname}`;
} }
export function extractFileName(url: string): string { export function extractFileName(url: string): string {