From a8ab0b7dabfe1e4f0d8625dcb3d9ba18a0ca8220 Mon Sep 17 00:00:00 2001 From: MICHAEL JACKSON Date: Wed, 8 Nov 2017 09:13:28 -0800 Subject: [PATCH] Fix failing tests --- package.json | 2 +- server/utils/createPackageURL.js | 4 ---- server/utils/parsePackageURL.test.js | 12 ++++++------ 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index e7e271b..2ba6bfa 100644 --- a/package.json +++ b/package.json @@ -117,6 +117,6 @@ }, "prettier": { "semi": false, - "single-quote": true + "singleQuote": true } } diff --git a/server/utils/createPackageURL.js b/server/utils/createPackageURL.js index dbeef43..e844fd0 100644 --- a/server/utils/createPackageURL.js +++ b/server/utils/createPackageURL.js @@ -1,12 +1,8 @@ function createPackageURL(packageName, version, filename, search) { let pathname = `/${packageName}` - if (version != null) pathname += `@${version}` - if (filename) pathname += filename - if (search) pathname += search - return pathname } diff --git a/server/utils/parsePackageURL.test.js b/server/utils/parsePackageURL.test.js index 7999f66..b3b7751 100644 --- a/server/utils/parsePackageURL.test.js +++ b/server/utils/parsePackageURL.test.js @@ -4,7 +4,7 @@ describe('parsePackageURL', () => { it('parses plain packages', () => { expect(parsePackageURL('/history@1.0.0/umd/history.min.js')).toEqual({ pathname: '/history@1.0.0/umd/history.min.js', - search: '', + search: null, query: {}, packageName: 'history', packageVersion: '1.0.0', @@ -15,7 +15,7 @@ describe('parsePackageURL', () => { it('parses plain packages with a hyphen in the name', () => { expect(parsePackageURL('/query-string@5.0.0/index.js')).toEqual({ pathname: '/query-string@5.0.0/index.js', - search: '', + search: null, query: {}, packageName: 'query-string', packageVersion: '5.0.0', @@ -26,7 +26,7 @@ describe('parsePackageURL', () => { it('parses plain packages with no version specified', () => { expect(parsePackageURL('/query-string/index.js')).toEqual({ pathname: '/query-string/index.js', - search: '', + search: null, query: {}, packageName: 'query-string', packageVersion: 'latest', @@ -37,7 +37,7 @@ describe('parsePackageURL', () => { it('parses plain packages with version spec', () => { expect(parsePackageURL('/query-string@>=4.0.0/index.js')).toEqual({ pathname: '/query-string@>=4.0.0/index.js', - search: '', + search: null, query: {}, packageName: 'query-string', packageVersion: '>=4.0.0', @@ -48,7 +48,7 @@ describe('parsePackageURL', () => { it('parses scoped packages', () => { expect(parsePackageURL('/@angular/router@4.3.3/src/index.d.ts')).toEqual({ pathname: '/@angular/router@4.3.3/src/index.d.ts', - search: '', + search: null, query: {}, packageName: '@angular/router', packageVersion: '4.3.3', @@ -59,7 +59,7 @@ describe('parsePackageURL', () => { it('parses package names with a period in them', () => { expect(parsePackageURL('/index.js')).toEqual({ pathname: '/index.js', - search: '', + search: null, query: {}, packageName: 'index.js', packageVersion: 'latest',