From 670e1d7477b7eb9a6c9e495830ede248674ba55a Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Fri, 31 Mar 2017 15:20:22 +0100
Subject: Change order of specs

---
 spec/javascripts/lib/utils/common_utils_spec.js | 83 +++++++++++++------------
 1 file changed, 42 insertions(+), 41 deletions(-)

(limited to 'spec')

diff --git a/spec/javascripts/lib/utils/common_utils_spec.js b/spec/javascripts/lib/utils/common_utils_spec.js
index 0fa4c51560b..5a93d479c1f 100644
--- a/spec/javascripts/lib/utils/common_utils_spec.js
+++ b/spec/javascripts/lib/utils/common_utils_spec.js
@@ -79,13 +79,54 @@ require('~/lib/utils/common_utils');
       });
     });
 
+    describe('gl.utils.setParamInURL', () => {
+      afterEach(() => {
+        window.history.pushState({}, null, '');
+      });
+
+      it('should return the parameter', () => {
+        window.history.replaceState({}, null, '');
+
+        expect(gl.utils.setParamInURL('page', 156)).toBe('?page=156');
+        expect(gl.utils.setParamInURL('page', '156')).toBe('?page=156');
+      });
+
+      it('should update the existing parameter when its a number', () => {
+        window.history.pushState({}, null, '?page=15');
+
+        expect(gl.utils.setParamInURL('page', 16)).toBe('?page=16');
+        expect(gl.utils.setParamInURL('page', '16')).toBe('?page=16');
+        expect(gl.utils.setParamInURL('page', true)).toBe('?page=true');
+      });
+
+      it('should update the existing parameter when its a string', () => {
+        window.history.pushState({}, null, '?scope=all');
+
+        expect(gl.utils.setParamInURL('scope', 'finished')).toBe('?scope=finished');
+      });
+
+      it('should update the existing parameter when more than one parameter exists', () => {
+        window.history.pushState({}, null, '?scope=all&page=15');
+
+        expect(gl.utils.setParamInURL('scope', 'finished')).toBe('?scope=finished&page=15');
+      });
+
+      it('should add a new parameter to the end of the existing ones', () => {
+        window.history.pushState({}, null, '?scope=all');
+
+        expect(gl.utils.setParamInURL('page', 16)).toBe('?scope=all&page=16');
+        expect(gl.utils.setParamInURL('page', '16')).toBe('?scope=all&page=16');
+        expect(gl.utils.setParamInURL('page', true)).toBe('?scope=all&page=true');
+      });
+    });
+
     describe('gl.utils.getParameterByName', () => {
       beforeEach(() => {
         window.history.pushState({}, null, '?scope=all&p=2');
       });
 
       afterEach(() => {
-        window.history.pushState({}, null, '');
+        window.history.replaceState({}, null, null);
       });
 
       it('should return valid parameter', () => {
@@ -269,45 +310,5 @@ require('~/lib/utils/common_utils');
         });
       }, 10000);
     });
-
-    describe('gl.utils.setParamInURL', () => {
-      afterEach(() => {
-        window.history.pushState({}, null, '');
-      });
-
-      it('should return the parameter', () => {
-        window.history.pushState({}, null, '');
-        expect(gl.utils.setParamInURL('page', 156)).toBe('?page=156');
-        expect(gl.utils.setParamInURL('page', '156')).toBe('?page=156');
-      });
-
-      it('should update the existing parameter when its a number', () => {
-        window.history.pushState({}, null, '?page=15');
-
-        expect(gl.utils.setParamInURL('page', 16)).toBe('?page=16');
-        expect(gl.utils.setParamInURL('page', '16')).toBe('?page=16');
-        expect(gl.utils.setParamInURL('page', true)).toBe('?page=true');
-      });
-
-      it('should update the existing parameter when its a string', () => {
-        window.history.pushState({}, null, '?scope=all');
-
-        expect(gl.utils.setParamInURL('scope', 'finished')).toBe('?scope=finished');
-      });
-
-      it('should update the existing parameter when more than one parameter exists', () => {
-        window.history.pushState({}, null, '?scope=all&page=15');
-
-        expect(gl.utils.setParamInURL('scope', 'finished')).toBe('?scope=finished&page=15');
-      });
-
-      it('should add a new parameter to the end of the existing ones', () => {
-        window.history.pushState({}, null, '?scope=all');
-
-        expect(gl.utils.setParamInURL('page', 16)).toBe('?scope=all&page=16');
-        expect(gl.utils.setParamInURL('page', '16')).toBe('?scope=all&page=16');
-        expect(gl.utils.setParamInURL('page', true)).toBe('?scope=all&page=true');
-      });
-    });
   });
 })();
-- 
cgit v1.2.3