Merge branch 'boards-querystring-backport' into 'master'

don't add trailing = when in urlParamsToArray function

See merge request gitlab-org/gitlab-ce!21179

3 files changed, 32 insertions, 37 deletions

diff --git a/spec/javascripts/boards/mock_data.js b/spec/javascripts/boards/mock_data.js
index 81f1a97112f..f380ef450db 100644
--- a/spec/javascripts/boards/mock_data.js
+++ b/spec/javascripts/boards/mock_data.js
@@ -27,7 +27,7 @@ export const listObjDuplicate = {
 
 export const BoardsMockData = {
   GET: {
-    '/test/-/boards/1/lists/300/issues?id=300&page=1&=': {
+    '/test/-/boards/1/lists/300/issues?id=300&page=1': {
       issues: [
         {
           title: 'Testing',
diff --git a/spec/javascripts/boards/utils/query_data_spec.js b/spec/javascripts/boards/utils/query_data_spec.js
deleted file mode 100644
index 922215ffc1d..00000000000
--- a/spec/javascripts/boards/utils/query_data_spec.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import queryData from '~/boards/utils/query_data';
-
-describe('queryData', () => {
-  it('parses path for label with trailing +', () => {
-    expect(
-      queryData('label_name[]=label%2B', {}),
-    ).toEqual({
-      label_name: ['label+'],
-    });
-  });
-
-  it('parses path for milestone with trailing +', () => {
-    expect(
-      queryData('milestone_title=A%2B', {}),
-    ).toEqual({
-      milestone_title: 'A+',
-    });
-  });
-
-  it('parses path for search terms with spaces', () => {
-    expect(
-      queryData('search=two+words', {}),
-    ).toEqual({
-      search: 'two words',
-    });
-  });
-});
diff --git a/spec/javascripts/lib/utils/common_utils_spec.js b/spec/javascripts/lib/utils/common_utils_spec.js
index babad296f09..28151c7e658 100644
--- a/spec/javascripts/lib/utils/common_utils_spec.js
+++ b/spec/javascripts/lib/utils/common_utils_spec.js
@@ -29,24 +29,46 @@ describe('common_utils', () => {
     });
   });
 
-  describe('getUrlParamsArray', () => {
-    it('should return params array', () => {
-      expect(commonUtils.getUrlParamsArray() instanceof Array).toBe(true);
+  describe('urlParamsToArray', () => {
+    it('returns empty array for empty querystring', () => {
+      expect(commonUtils.urlParamsToArray('')).toEqual([]);
+    });
+
+    it('should decode params', () => {
+      expect(
+        commonUtils.urlParamsToArray('?label_name%5B%5D=test')[0],
+      ).toBe('label_name[]=test');
     });
 
     it('should remove the question mark from the search params', () => {
-      const paramsArray = commonUtils.getUrlParamsArray();
+      const paramsArray = commonUtils.urlParamsToArray('?test=thing');
       expect(paramsArray[0][0] !== '?').toBe(true);
     });
+  });
 
-    it('should decode params', () => {
-      window.history.pushState('', '', '?label_name%5B%5D=test');
+  describe('urlParamsToObject', () => {
+    it('parses path for label with trailing +', () => {
+      expect(
+        commonUtils.urlParamsToObject('label_name[]=label%2B', {}),
+      ).toEqual({
+        label_name: ['label+'],
+      });
+    });
 
+    it('parses path for milestone with trailing +', () => {
       expect(
-        commonUtils.getUrlParamsArray()[0],
-      ).toBe('label_name[]=test');
+        commonUtils.urlParamsToObject('milestone_title=A%2B', {}),
+      ).toEqual({
+        milestone_title: 'A+',
+      });
+    });
 
-      window.history.pushState('', '', '?');
+    it('parses path for search terms with spaces', () => {
+      expect(
+        commonUtils.urlParamsToObject('search=two+words', {}),
+      ).toEqual({
+        search: 'two words',
+      });
     });
   });