re-refactor after fixing merge conflicts

test/unit/util/tutorial-from-url.test.js

@@ -8,45 +8,40 @@ jest.mock('../../../src/lib/libraries/decks/index.jsx', () => ({
     noUrlIdSandwich: {}
 }));
 
+import queryString from 'query-string';
 import {detectTutorialId} from '../../../src/lib/tutorial-from-url.js';
 
-Object.defineProperty(
-    window.location,
-    'search',
-    {value: '', writable: true}
-);
-
 test('returns the tutorial ID if the urlId matches', () => {
-    window.location.search = '?tutorial=one';
-    expect(detectTutorialId()).toBe('foo');
+    const queryParams = queryString.parse('?tutorial=one');
+    expect(detectTutorialId(queryParams)).toBe('foo');
 });
 
 test('returns null if no matching urlId', () => {
-    window.location.search = '?tutorial=10';
-    expect(detectTutorialId()).toBe(null);
+    const queryParams = queryString.parse('?tutorial=10');
+    expect(detectTutorialId(queryParams)).toBe(null);
 });
 
 test('returns null if empty template', () => {
-    window.location.search = '?tutorial=';
-    expect(detectTutorialId()).toBe(null);
+    const queryParams = queryString.parse('?tutorial=');
+    expect(detectTutorialId(queryParams)).toBe(null);
 });
 
 test('returns null if no query param', () => {
-    window.location.search = '';
-    expect(detectTutorialId()).toBe(null);
+    const queryParams = queryString.parse('');
+    expect(detectTutorialId(queryParams)).toBe(null);
 });
 
 test('returns null if unrecognized template', () => {
-    window.location.search = '?tutorial=asdf';
-    expect(detectTutorialId()).toBe(null);
+    const queryParams = queryString.parse('?tutorial=asdf');
+    expect(detectTutorialId(queryParams)).toBe(null);
 });
 
 test('takes the first of multiple', () => {
-    window.location.search = '?tutorial=one&tutorial=two';
-    expect(detectTutorialId()).toBe('foo');
+    const queryParams = queryString.parse('?tutorial=one&tutorial=two');
+    expect(detectTutorialId(queryParams)).toBe('foo');
 });
 
 test('returns all for the tutorial library shortcut', () => {
-    window.location.search = '?tutorial=all';
-    expect(detectTutorialId()).toBe('all');
+    const queryParams = queryString.parse('?tutorial=all');
+    expect(detectTutorialId(queryParams)).toBe('all');
 });