URL: Avoid modifying input URL without any querystring

WordPress · Mar 13, 2020 · e5e0f60 · e5e0f60
1 parent 1c8921a
commit e5e0f60
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/packages/url/src/remove-query-args.js b/packages/url/src/remove-query-args.js
@@ -19,11 +19,12 @@ import { buildQueryString } from './build-query-string';
  */
 export function removeQueryArgs( url, ...args ) {
 	const queryStringIndex = url.indexOf( '?' );
-	const query = getQueryArgs( url );
-	const baseUrl =
-		queryStringIndex !== -1 ? url.substr( 0, queryStringIndex ) : url;
+	if ( queryStringIndex === -1 ) {
+		return url;
+	}
 
+	const query = getQueryArgs( url );
+	const baseURL = url.substr( 0, queryStringIndex );
 	args.forEach( ( arg ) => delete query[ arg ] );
-
-	return baseUrl + '?' + buildQueryString( query );
+	return baseURL + '?' + buildQueryString( query );
 }
diff --git a/packages/url/src/test/index.test.js b/packages/url/src/test/index.test.js
@@ -700,6 +700,12 @@ describe( 'hasQueryArg', () => {
 } );
 
 describe( 'removeQueryArgs', () => {
+	it( 'should not change URL without a querystring', () => {
+		const url = 'https://andalouses.example/beach';
+
+		expect( removeQueryArgs( url, 'baz', 'test' ) ).toEqual( url );
+	} );
+
 	it( 'should not change URL not containing query args', () => {
 		const url = 'https://andalouses.example/beach?foo=bar&bar=baz';