FIX Get JS tests passing again

babel.config.json

@@ -0,0 +1,6 @@
+{
+  "presets": [
+    "@babel/preset-env",
+    "@babel/preset-react"
+  ]
+}

client/src/components/AssetDropzone/tests/AssetDropzone-test.js

@@ -1,4 +1,4 @@
-/* global jest, jasmine, describe, it, expect, beforeEach, FormData */
+/* global jest, describe, it, expect, beforeEach, FormData */
 
 import React from 'react';
 import ReactTestUtils from 'react-dom/test-utils';
@@ -24,15 +24,10 @@ describe('AssetDropzone', () => {
     let item = null;
 
     beforeEach(() => {
-      item = ReactTestUtils.renderIntoDocument(
-        <AssetDropzone {...props} />
-      );
+      item = new AssetDropzone();
     });
 
     it('should set this.dropzone to null', () => {
-      item.dropzone = 1;
-      item.constructor(props);
-
       expect(item.dropzone).toBe(null);
     });
   });

client/src/components/BackButton/tests/BackButton-test.js

@@ -1,4 +1,4 @@
-/* global jest, jasmine, describe, it, expect, beforeEach */
+/* global jest, describe, it, expect, beforeEach */
 
 import React from 'react';
 import ReactTestUtils from 'react-dom/test-utils';

client/src/components/BulkActions/tests/BulkActions-test.js

@@ -1,4 +1,4 @@
-/* global jest, jasmine, describe, it, expect, beforeEach */
+/* global jest, describe, it, expect, beforeEach */
 
 jest.mock('jquery', () => {
   const jqueryMock = {
@@ -131,7 +131,7 @@ describe('BulkActions', () => {
       const callbackMockFn = jest.fn();
 
       bulkActions.getOptionByValue
-        .mockReturnValueOnce({ confirm: Promise.resolve(), callback: callbackMockFn });
+        .mockReturnValueOnce({ confirm: () => Promise.resolve(), callback: callbackMockFn });
       return bulkActions.handleChangeValue(event).then(() => {
         expect(callbackMockFn).toBeCalled();
       });
@@ -141,9 +141,9 @@ describe('BulkActions', () => {
       const callbackMockFn = jest.fn();
 
       bulkActions.getOptionByValue
-        .mockReturnValueOnce({ confirm: Promise.reject(), callback: callbackMockFn });
+        .mockReturnValueOnce({ confirm: () => Promise.reject('cancelled'), callback: callbackMockFn });
       return bulkActions.handleChangeValue(event).then(() => {
-        expect(callbackMockFn).toBeCalled();
+        expect(callbackMockFn).not.toBeCalled();
       });
     });
   });

client/src/components/GalleryItem/tests/GalleryItem-test.js

@@ -1,4 +1,4 @@
-/* global jest, jasmine, describe, it, expect, beforeEach, Event */
+/* global jest, describe, it, expect, beforeEach, Event */
 
 import React from 'react';
 import ReactTestUtils from 'react-dom/test-utils';

client/src/components/InsertEmbedModal/tests/InsertEmbedModal-test.js

@@ -1,4 +1,4 @@
-/* global jest, jasmine, describe, it, expect, beforeEach */
+/* global jest, describe, it, expect, beforeEach */
 
 // FormBuilderLoader mock was not mocking properly
 // manually override with a stateless null component

client/src/components/PreviewImageField/tests/PreviewImageField-test.js

@@ -1,4 +1,4 @@
-/* global jest, jasmine, describe, it, expect, beforeEach */
+/* global jest, describe, it, expect, beforeEach */
 
 jest.mock('components/AssetDropzone/AssetDropzone');
 

client/src/components/ProportionConstraintField/tests/ImageSizePresetList-test.js

@@ -1,4 +1,4 @@
-/* global jest, jasmine, describe, it, expect, beforeEach */
+/* global jest, describe, it, expect, beforeEach */
 
 import React from 'react';
 import ImageSizePresetList from '../ImageSizePresetList';

client/src/components/ProportionConstraintField/tests/ProportionConstraintField-test.js

@@ -1,4 +1,4 @@
-/* global jest, jasmine, describe, it, expect, beforeEach */
+/* global jest, describe, it, expect, beforeEach */
 
 import React from 'react';
 import ReactTestUtils from 'react-dom/test-utils';

client/src/components/UploadField/tests/UploadField-test.js

@@ -1,4 +1,4 @@
-/* global jest, jasmine, describe, it, expect, beforeEach */
+/* global jest, describe, it, expect, beforeEach */
 
 import React from 'react';
 import ReactTestUtils from 'react-dom/test-utils';

client/src/components/UploadField/tests/UploadFieldItem-test.js

@@ -1,4 +1,4 @@
-/* global jest, jasmine, describe, it, expect, beforeEach */
+/* global jest, describe, it, expect, beforeEach */
 
 import React from 'react';
 import ReactTestUtils from 'react-dom/test-utils';

client/src/containers/AssetAdmin/AssetAdmin.js

@@ -30,10 +30,6 @@ import AssetAdminBreadcrumb from './AssetAdminBreadcrumb';
 class AssetAdmin extends Component {
   constructor(props) {
     super(props);
-    // Needed to avoid warnings about missing state when getDerivedStateFromProps is called
-    if (!this.state) {
-      this.state = {};
-    }
 
     this.handleOpenFile = this.handleOpenFile.bind(this);
     this.handleCloseFile = this.handleCloseFile.bind(this);
@@ -58,11 +54,10 @@ class AssetAdmin extends Component {
     this.handleMoveFilesSuccess = this.handleMoveFilesSuccess.bind(this);
   }
 
-  static getDerivedStateFromProps(props) {
-    if (!props.loading && props.folder && props.folderId !== props.folder.id) {
+  componentWillReceiveProps(props) {
+    if ((typeof props.onReplaceUrl === 'function') && !props.loading && props.folder && props.folderId !== props.folder.id) {
       props.onReplaceUrl(props.folder.id, props.fileId, props.query, props.viewAction);
     }
-    return null;
   }
 
   /**

client/src/containers/AssetAdmin/tests/AssetAdmin-test.js

@@ -1,4 +1,4 @@
-/* global jest, describe, it, pit, expect, beforeEach, jasmine */
+/* global jest, describe, it, pit, expect, beforeEach */
 
 // mock sub-components, as they could rely on a Redux store context and not necessary for unit test
 jest.mock('containers/Editor/Editor');

client/src/containers/AssetAdmin/tests/AssetAdminBreadcrumb-test.js

@@ -1,4 +1,4 @@
-/* global jest, describe, it, pit, expect, beforeEach, jasmine */
+/* global jest, describe, it, pit, expect, beforeEach */
 import Breadcrumb from '../AssetAdminBreadcrumb';
 import ShallowRenderer from 'react-test-renderer/shallow';
 import React from 'react';

client/src/containers/AssetAdmin/tests/AssetAdminRouter-test.js

@@ -1,4 +1,4 @@
-/* global jest, describe, it, pit, expect, beforeEach, jasmine */
+/* global jest, describe, it, pit, expect, beforeEach */
 
 // mock sub-components, as they could rely on a Redux store context and not necessary for unit test
 jest.mock('containers/AssetAdmin/AssetAdmin');
@@ -17,19 +17,14 @@ describe('AssetAdminRouter', () => {
         limit: 10,
         form: {},
       },
-      location: {
-        pathname: '',
-        query: {},
-        search: '',
-      },
-      match: {
-        params: {
-          fileId: '0',
-          folderId: '0',
+      router: {
+        location: {
+          pathname: '',
+          query: {},
+          search: '',
         },
-      },
-      history: {
-        push: jest.fn(),
+        navigate: jest.fn(),
+        params: {},
       },
     };
   });
@@ -42,7 +37,7 @@ describe('AssetAdminRouter', () => {
     });
 
     it('should retain page query parameter when not changing folders', () => {
-      const newUrl = component.getUrl(props.match.params.folderId, null, { page: 2 });
+      const newUrl = component.getUrl(props.router.params.folderId, null, { page: 2 });
       expect(newUrl).toContain('page=2');
     });
 

client/src/containers/BulkDeleteConfirmation/tests/BulkDeleteConfirmation-test.js

@@ -1,4 +1,4 @@
-/* global jest, jasmine, describe, it, expect, beforeEach, Event */
+/* global jest, describe, it, expect, beforeEach, Event */
 
 import React from 'react';
 import { Component } from '../BulkDeleteConfirmation';

client/src/containers/BulkDeleteConfirmation/tests/BulkDeleteMessage-test.js

@@ -1,4 +1,4 @@
-/* global jest, jasmine, describe, it, expect, beforeEach, Event */
+/* global jest, describe, it, expect, beforeEach, Event */
 
 import React from 'react';
 import Component from '../BulkDeleteMessage';

client/src/containers/BulkDeleteConfirmation/tests/helpers-test.js

@@ -1,4 +1,4 @@
-/* global jest, describe, it, pit, expect, beforeEach, jasmine */
+/* global jest, describe, it, pit, expect, beforeEach */
 import { getFolderDescendantFileTotals, getFileTotalItems } from '../helpers';
 import { mockfiles as files } from './mockfiles';
 

client/src/containers/Editor/tests/Editor-test.js

@@ -1,4 +1,4 @@
-/* global jest, jasmine, describe, it, expect, beforeEach, FormData */
+/* global jest, describe, it, expect, beforeEach, FormData */
 jest.mock('containers/FormBuilderLoader/FormBuilderLoader');
 jest.mock('components/FormBuilderModal/FormBuilderModal');
 

client/src/containers/Editor/tests/EditorHeader-test.js

@@ -1,4 +1,4 @@
-/* global jest, jasmine, describe, it, expect, beforeEach, FormData */
+/* global jest, describe, it, expect, beforeEach, FormData */
 jest.mock('containers/FormBuilderLoader/FormBuilderLoader');
 jest.mock('components/FormBuilderModal/FormBuilderModal');
 

client/src/containers/Gallery/tests/Gallery-test.js

@@ -471,21 +471,6 @@ describe('Gallery', () => {
     });
   });
 
-  describe('handleCreateFolder()', () => {
-    let gallery = null;
-
-    beforeEach(() => {
-      props.onCreateFolder = jest.fn();
-
-      gallery = ReactTestUtils.renderIntoDocument(
-        <Gallery {...props} />
-      );
-      gallery.handleCreateFolder();
-
-      expect(props.onCreateFolder).toBeCalled();
-    });
-  });
-
   describe('bulkActions', () => {
     let gallery = null;
 

client/src/lib/tests/getFormSchema-test.js

@@ -1,4 +1,4 @@
-/* global jest, jasmine, describe, it, expect, beforeEach, FormData */
+/* global jest, describe, it, expect, beforeEach, FormData */
 
 import getFormSchema from '../getFormSchema';
 import CONSTANTS from 'constants/index';

client/src/lib/tests/getStatusCodeMessage-test.js

@@ -1,4 +1,4 @@
-/* global jest, jasmine, describe, it, expect, beforeEach, FormData */
+/* global jest, describe, it, expect, beforeEach, FormData */
 
 import getStatusCodeMessage from '../getStatusCodeMessage';
 

client/src/state/confirmDeletion/tests/ConfirmDeletionReducer-test.js

@@ -1,4 +1,4 @@
-/* global jest, describe, it, pit, expect, beforeEach, jasmine */
+/* global jest, describe, it, pit, expect, beforeEach */
 import reducer, { initialState } from '../ConfirmDeletionReducer';
 import ACTION_TYPES from '../ConfirmDeletionActionTypes';
 import * as TRANSITIONS from '../ConfirmDeletionTransitions';

client/src/state/files/tests/readFilesQuery-test.js

@@ -1,4 +1,4 @@
-/* global jest, describe, it, pit, expect, beforeEach, jasmine */
+/* global jest, describe, it, pit, expect, beforeEach */
 
 import query from '../readFilesQuery';
 

client/src/state/imageLoad/tests/ImageLoadActionHandler-test.js

@@ -1,4 +1,4 @@
-/* global jest, describe, it, expect, beforeEach, jasmine */
+/* global jest, describe, it, expect, beforeEach */
 
 import ImageLoadActionHandler from '../ImageLoadActionHandler';
 import IMAGE_STATUS from '../ImageLoadStatus';
@@ -36,7 +36,9 @@ describe('ImageLoadActionHandler', () => {
   });
 
   it('eternally failing images end up failed', () => {
-    jest.useFakeTimers();
+    jest.useFakeTimers({
+      legacyFakeTimers: true,
+    });
 
     const options = {
       minRetry: 4,
@@ -49,7 +51,7 @@ describe('ImageLoadActionHandler', () => {
     // Create handler which always fails
     const loadImageHandler = new ImageLoadActionHandler(
       options,
-      (url, resolve, reject) => { reject(); }
+      (url, resolve, reject) => { reject(4); }
     );
 
     // Attempts three times, after a 4 second then 8 second retry delay
@@ -73,7 +75,9 @@ describe('ImageLoadActionHandler', () => {
   });
 
   it('initially failing download can eventually succeed', () => {
-    jest.useFakeTimers();
+    jest.useFakeTimers({
+      legacyFakeTimers: true,
+    });
 
     const options = {
       minRetry: 4,
@@ -88,7 +92,7 @@ describe('ImageLoadActionHandler', () => {
       if (attempts > 2) {
         resolve();
       } else {
-        reject();
+        reject(2);
       }
     };
 
@@ -110,7 +114,9 @@ describe('ImageLoadActionHandler', () => {
   });
 
   it('failed download with expiry will eventually expire', () => {
-    jest.useFakeTimers();
+    jest.useFakeTimers({
+      legacyFakeTimers: true,
+    });
 
     const options = {
       minRetry: 4,
@@ -121,7 +127,7 @@ describe('ImageLoadActionHandler', () => {
       // ensure all future timers advance automatically
       onTimeout: () => jest.runAllTimers(),
     };
-    const handler = (url, resolve, reject) => { reject(); };
+    const handler = (url, resolve, reject) => { reject(3); };
     // Create handler which always fails
     const loadImageHandler = new ImageLoadActionHandler(
       options,

client/src/state/imageLoad/tests/ImageLoadActions-test.js

@@ -1,4 +1,4 @@
-/* global jest, describe, it, expect, beforeEach, jasmine */
+/* global jest, describe, it, expect, beforeEach */
 
 jest.mock('../ImageLoadActionHandler', () => jest.fn());
 

client/src/state/imageLoad/tests/ImageLoadLocker-test.js

@@ -1,4 +1,4 @@
-/* global jest, describe, it, expect, beforeEach, jasmine */
+/* global jest, describe, it, expect, beforeEach */
 
 jest.unmock('../ImageLoadLocker');
 

client/src/state/modal/tests/ModalReducer-test.js

@@ -1,4 +1,4 @@
-/* global jest, describe, it, pit, expect, beforeEach, jasmine */
+/* global jest, describe, it, pit, expect, beforeEach */
 import reducer, { initialState } from '../ModalReducer';
 import {
   defineImageSizePresets,

client/src/state/modal/tests/helpers-test.js

@@ -1,4 +1,4 @@
-/* global jest, describe, it, pit, expect, beforeEach, jasmine */
+/* global jest, describe, it, pit, expect, beforeEach */
 import isStashableField, { findField } from '../helpers';
 
 const stashable = {

client/src/state/previewField/tests/PreviewFieldReducer-test.js

@@ -1,4 +1,4 @@
-/* global jest, describe, it, expect, beforeEach, jasmine */
+/* global jest, describe, it, expect, beforeEach */
 
 import previewFieldReducer from '../PreviewFieldReducer';
 import ACTION_TYPES from '../PreviewFieldActionTypes';

client/src/state/queuedFiles/tests/QueuedFilesReducer-test.js

@@ -1,4 +1,4 @@
-/* global jest, jasmine, describe, it, expect, beforeEach */
+/* global jest, describe, it, expect, beforeEach */
 
 import queuedFilesReducer from '../QueuedFilesReducer';
 

client/src/state/uploadField/tests/UploadFieldReducer-test.js

@@ -1,4 +1,4 @@
-/* global jest, describe, it, expect, beforeEach, jasmine */
+/* global jest, describe, it, expect, beforeEach */
 
 import uploadFieldReducer from '../UploadFieldReducer';
 import fileStructure from '../../../lib/fileStructure';
@@ -122,7 +122,7 @@ describe('uploadFieldReducer', () => {
       });
       expect(nextState.fields.anotherfield.files.length).toBe(2);
       expect(nextState.fields.anotherfield.files[1]).toEqual(
-        jasmine.objectContaining({
+        expect.objectContaining({
           id: 10,
           queuedId: 'xyz',
           name: 'InProgressFile.jpg',