From 9c229a01b0190c9594e8956e01a8b3e83d7b7335 Mon Sep 17 00:00:00 2001
From: Kyle Doherty <kyle.l.doherty@gmail.com>
Date: Tue, 19 Sep 2017 11:22:41 -0700
Subject: [PATCH] use built in jest timers

---
 .../LoadingAndErrorWrapper.unit.spec.js       | 25 ++++++-------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/frontend/test/components/LoadingAndErrorWrapper.unit.spec.js b/frontend/test/components/LoadingAndErrorWrapper.unit.spec.js
index 60be1499bb6..35a916a1b5a 100644
--- a/frontend/test/components/LoadingAndErrorWrapper.unit.spec.js
+++ b/frontend/test/components/LoadingAndErrorWrapper.unit.spec.js
@@ -1,6 +1,5 @@
 import React from 'react'
 import { shallow, mount } from 'enzyme'
-import sinon from 'sinon'
 
 import LoadingAndErrorWrapper from 'metabase/components/LoadingAndErrorWrapper'
 
@@ -43,16 +42,8 @@ describe('LoadingAndErrorWrapper', () => {
         })
 
         describe('cycling', () => {
-            let clock
-
-            beforeEach(() => {
-                clock = sinon.useFakeTimers()
-            })
-            afterEach(() => {
-                clock.restore()
-            })
-
             it('should cycle through loading messages if provided', () => {
+                jest.useFakeTimers()
 
                 const interval = 6000
 
@@ -72,20 +63,20 @@ describe('LoadingAndErrorWrapper', () => {
                 )
 
                 const instance = wrapper.instance()
-                const spy = sinon.spy(instance, 'cycleLoadingMessage')
+                const spy = jest.spyOn(instance, 'cycleLoadingMessage')
 
                 expect(wrapper.text()).toMatch(/One/)
 
-                clock.tick(interval)
-                expect(spy.called).toEqual(true)
+                jest.runTimersToTime(interval)
+                expect(spy).toHaveBeenCalled()
                 expect(wrapper.text()).toMatch(/Two/)
 
-                clock.tick(interval)
-                expect(spy.called).toEqual(true)
+                jest.runTimersToTime(interval)
+                expect(spy).toHaveBeenCalled()
                 expect(wrapper.text()).toMatch(/Three/)
 
-                clock.tick(interval)
-                expect(spy.called).toEqual(true)
+                jest.runTimersToTime(interval)
+                expect(spy).toHaveBeenCalled()
                 expect(wrapper.text()).toMatch(/One/)
             })
 
-- 
GitLab