Removed remaining usages of sinon

test/short-urls/helpers/CreateShortUrlResult.test.js

@@ -3,12 +3,11 @@ import { shallow } from 'enzyme';
 import { identity } from 'ramda';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
 import { Tooltip } from 'reactstrap';
-import * as sinon from 'sinon';
 import createCreateShortUrlResult from '../../../src/short-urls/helpers/CreateShortUrlResult';
 
 describe('<CreateShortUrlResult />', () => {
   let wrapper;
-  const stateFlagTimeout = sinon.spy();
+  const stateFlagTimeout = jest.fn();
   const createWrapper = (result, error = false) => {
     const CreateShortUrlResult = createCreateShortUrlResult(stateFlagTimeout);
 
@@ -18,7 +17,7 @@ describe('<CreateShortUrlResult />', () => {
   };
 
   afterEach(() => {
-    stateFlagTimeout.resetHistory();
+    stateFlagTimeout.mockReset();
     wrapper && wrapper.unmount();
   });
 
@@ -48,8 +47,8 @@ describe('<CreateShortUrlResult />', () => {
     const wrapper = createWrapper({ shortUrl: 'https://doma.in/abc123' });
     const copyBtn = wrapper.find(CopyToClipboard);
 
-    expect(stateFlagTimeout.callCount).toEqual(0);
+    expect(stateFlagTimeout).not.toHaveBeenCalled();
     copyBtn.simulate('copy');
-    expect(stateFlagTimeout.callCount).toEqual(1);
+    expect(stateFlagTimeout).toHaveBeenCalledTimes(1);
   });
 });

test/short-urls/helpers/DeleteShortUrlModal.test.js

@@ -1,7 +1,6 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import { identity } from 'ramda';
-import * as sinon from 'sinon';
 import DeleteShortUrlModal from '../../../src/short-urls/helpers/DeleteShortUrlModal';
 
 describe('<DeleteShortUrlModal />', () => {
@@ -11,7 +10,7 @@ describe('<DeleteShortUrlModal />', () => {
     shortCode: 'abc123',
     originalUrl: 'https://long-domain.com/foo/bar',
   };
-  const deleteShortUrl = sinon.fake.returns(Promise.resolve());
+  const deleteShortUrl = jest.fn(() => Promise.resolve());
   const createWrapper = (shortUrlDeletion) => {
     wrapper = shallow(
       <DeleteShortUrlModal
@@ -30,7 +29,7 @@ describe('<DeleteShortUrlModal />', () => {
 
   afterEach(() => {
     wrapper && wrapper.unmount();
-    deleteShortUrl.resetHistory();
+    deleteShortUrl.mockClear();
   });
 
   it('shows threshold error message when threshold error occurs', () => {
@@ -106,9 +105,9 @@ describe('<DeleteShortUrlModal />', () => {
     setImmediate(() => {
       const form = wrapper.find('form');
 
-      expect(deleteShortUrl.callCount).toEqual(0);
+      expect(deleteShortUrl).not.toHaveBeenCalled();
       form.simulate('submit', { preventDefault: identity });
-      expect(deleteShortUrl.callCount).toEqual(1);
+      expect(deleteShortUrl).toHaveBeenCalledTimes(1);
       done();
     });
   });

test/short-urls/helpers/EditTagsModal.test.js

@@ -1,6 +1,5 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import * as sinon from 'sinon';
 import { Modal } from 'reactstrap';
 import createEditTagsModal from '../../../src/short-urls/helpers/EditTagsModal';
 
@@ -8,10 +7,10 @@ describe('<EditTagsModal />', () => {
   let wrapper;
   const shortCode = 'abc123';
   const TagsSelector = () => '';
-  const editShortUrlTags = sinon.fake.resolves();
-  const shortUrlTagsEdited = sinon.fake();
-  const resetShortUrlsTags = sinon.fake();
-  const toggle = sinon.fake();
+  const editShortUrlTags = jest.fn(() => Promise.resolve());
+  const shortUrlTagsEdited = jest.fn();
+  const resetShortUrlsTags = jest.fn();
+  const toggle = jest.fn();
   const createWrapper = (shortUrlTags) => {
     const EditTagsModal = createEditTagsModal(TagsSelector);
 
@@ -37,10 +36,10 @@ describe('<EditTagsModal />', () => {
 
   afterEach(() => {
     wrapper && wrapper.unmount();
-    editShortUrlTags.resetHistory();
-    shortUrlTagsEdited.resetHistory();
-    resetShortUrlsTags.resetHistory();
-    toggle.resetHistory();
+    editShortUrlTags.mockClear();
+    shortUrlTagsEdited.mockReset();
+    resetShortUrlsTags.mockReset();
+    toggle.mockReset();
   });
 
   it('resets tags when component is mounted', () => {
@@ -51,7 +50,7 @@ describe('<EditTagsModal />', () => {
       error: false,
     });
 
-    expect(resetShortUrlsTags.callCount).toEqual(1);
+    expect(resetShortUrlsTags).toHaveBeenCalledTimes(1);
   });
 
   it('renders tags selector and save button when loaded', () => {
@@ -92,12 +91,12 @@ describe('<EditTagsModal />', () => {
 
     saveBtn.simulate('click');
 
-    expect(editShortUrlTags.callCount).toEqual(1);
-    expect(editShortUrlTags.getCall(0).args).toEqual([ shortCode, []]);
+    expect(editShortUrlTags).toHaveBeenCalledTimes(1);
+    expect(editShortUrlTags.mock.calls[0]).toEqual([ shortCode, []]);
 
     // Wrap this expect in a setImmediate since it is called as a result of an inner promise
     setImmediate(() => {
-      expect(toggle.callCount).toEqual(1);
+      expect(toggle).toHaveBeenCalledTimes(1);
       done();
     });
   });
@@ -112,7 +111,7 @@ describe('<EditTagsModal />', () => {
     const modal = wrapper.find(Modal);
 
     modal.simulate('closed');
-    expect(shortUrlTagsEdited.callCount).toEqual(0);
+    expect(shortUrlTagsEdited).not.toHaveBeenCalled();
   });
 
   it('notifies tags have been edited when window is closed after saving', (done) => {
@@ -130,8 +129,8 @@ describe('<EditTagsModal />', () => {
     // Wrap this expect in a setImmediate since it is called as a result of an inner promise
     setImmediate(() => {
       modal.simulate('closed');
-      expect(shortUrlTagsEdited.callCount).toEqual(1);
-      expect(shortUrlTagsEdited.getCall(0).args).toEqual([ shortCode, []]);
+      expect(shortUrlTagsEdited).toHaveBeenCalledTimes(1);
+      expect(shortUrlTagsEdited.mock.calls[0]).toEqual([ shortCode, []]);
       done();
     });
   });
@@ -146,6 +145,6 @@ describe('<EditTagsModal />', () => {
     const cancelBtn = wrapper.find('.btn-link');
 
     cancelBtn.simulate('click');
-    expect(toggle.callCount).toEqual(1);
+    expect(toggle).toHaveBeenCalledTimes(1);
   });
 });

test/short-urls/helpers/ShortUrlsRow.test.js

@@ -3,7 +3,6 @@ import { shallow } from 'enzyme';
 import moment from 'moment';
 import Moment from 'react-moment';
 import { assoc, toString } from 'ramda';
-import * as sinon from 'sinon';
 import createShortUrlsRow from '../../../src/short-urls/helpers/ShortUrlsRow';
 import ExternalLink from '../../../src/utils/ExternalLink';
 import Tag from '../../../src/tags/helpers/Tag';
@@ -12,7 +11,7 @@ describe('<ShortUrlsRow />', () => {
   let wrapper;
   const mockFunction = () => '';
   const ShortUrlsRowMenu = mockFunction;
-  const stateFlagTimeout = sinon.spy();
+  const stateFlagTimeout = jest.fn();
   const colorGenerator = {
     getColorForKey: mockFunction,
     setColorForKey: mockFunction,
@@ -92,9 +91,9 @@ describe('<ShortUrlsRow />', () => {
     const menu = col.find(ShortUrlsRowMenu);
 
     expect(menu).toHaveLength(1);
-    expect(stateFlagTimeout.called).toEqual(false);
+    expect(stateFlagTimeout).not.toHaveBeenCalled();
     menu.simulate('copyToClipboard');
-    expect(stateFlagTimeout.calledOnce).toEqual(true);
+    expect(stateFlagTimeout).toHaveBeenCalledTimes(1);
   });
 
   it('shows copy hint when state prop is true', () => {

test/short-urls/helpers/ShortUrlsRowMenu.test.js

@@ -1,6 +1,5 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import * as sinon from 'sinon';
 import { ButtonDropdown, DropdownItem } from 'reactstrap';
 import createShortUrlsRowMenu from '../../../src/short-urls/helpers/ShortUrlsRowMenu';
 import PreviewModal from '../../../src/short-urls/helpers/PreviewModal';
@@ -10,7 +9,7 @@ describe('<ShortUrlsRowMenu />', () => {
   let wrapper;
   const DeleteShortUrlModal = () => '';
   const EditTagsModal = () => '';
-  const onCopyToClipboard = sinon.spy();
+  const onCopyToClipboard = jest.fn();
   const selectedServer = { id: 'abc123' };
   const shortUrl = {
     shortCode: 'abc123',