Add more tests and updates to component

ryanhefner · Jun 17, 2018 · 8260d57 · 8260d57
1 parent 58b3295
commit 8260d57
Show file tree

Hide file tree

Showing 2 changed files with 133 additions and 14 deletions.
diff --git a/src/index.js b/src/index.js
@@ -49,10 +49,14 @@ class TimerWrapper extends Component {
       onStop,
     } = nextProps;
 
-    if (time !== this.props.time) {
+    if (active === this.props.active && time !== this.state.time) {
+      const timeDiff = this.state.time - time;
+
       this.setState({
-        time,
+        startTime: this.state.startTime + timeDiff,
+        time: this.state.time + timeDiff,
       });
+      return;
     }
 
     if (active !== this.props.active) {
@@ -65,15 +69,15 @@ class TimerWrapper extends Component {
           this.setState({
             startTime: Date.now() - nextTime,
             time: nextTime,
+          }, () => {
+            onStart({
+              duration,
+              progress: this.getProgress(nextTime),
+              time: nextTime,
+            });
+
+            this.animationFrame = requestAnimationFrame(this.tick);
           });
-
-          onStart({
-            duration,
-            progress: this.getProgress(nextTime),
-            time: nextTime,
-          });
-
-          this.animationFrame = requestAnimationFrame(this.tick);
           break;
 
         case false:

diff --git a/src/index.test.js b/src/index.test.js
@@ -197,6 +197,22 @@ describe('<Timer />', () => {
     component.unmount();
   });
 
+  test('onStop - called', () => {
+    expect.assertions(2);
+
+    const onStop = jest.fn();
+
+    component = mount(<Timer active onStop={onStop} />, {
+      attachTo: document.getElementById('root'),
+    });
+
+    expect(onStop).not.toBeCalled();
+    component.setProps({ active: false });
+    expect(onStop).toBeCalled();
+
+    component.unmount();
+  });
+
   test('time offset supported - onStart', () => {
     const onStart = jest.fn();
 
@@ -248,18 +264,117 @@ describe('<Timer />', () => {
     component.unmount();
   });
 
-  test('onStop - called', () => {
+  test('time prop changed', () => {
     expect.assertions(2);
+    const onTimeUpdate = jest.fn();
 
+    component = mount(<Timer active onTimeUpdate={onTimeUpdate} />, {
+      attachTo: document.getElementById('root'),
+    });
+
+    clock.tick(16);
+    expect(onTimeUpdate).toHaveBeenLastCalledWith({
+      duration: 10000,
+      progress: 0.0016,
+      time: 16,
+    });
+    component.setProps({ time: 5000 });
+    clock.tick(16);
+    expect(onTimeUpdate).toHaveBeenLastCalledWith({
+      duration: 10000,
+      progress: 0.5016,
+      time: 5016,
+    });
+
+    component.unmount();
+  });
+
+  test('active prop changed - after timer complete', () => {
+    expect.assertions(4);
+
+    const onStart = jest.fn();
     const onStop = jest.fn();
+    const onTimeUpdate = jest.fn();
 
-    component = mount(<Timer active onStop={onStop} />, {
+    component = mount((
+      <Timer
+        active
+        onStart={onStart}
+        onStop={onStop}
+        onTimeUpdate={onTimeUpdate}
+      />
+    ), {
       attachTo: document.getElementById('root'),
     });
 
-    expect(onStop).not.toBeCalled();
+    expect(onStart).toHaveBeenLastCalledWith({
+      duration: 10000,
+      progress: 0,
+      time: 0,
+    });
+    clock.tick(10000);
+    expect(onTimeUpdate).toHaveBeenLastCalledWith({
+      duration: 10000,
+      progress: 1,
+      time: 10000,
+    });
     component.setProps({ active: false });
-    expect(onStop).toBeCalled();
+    expect(onStop).toHaveBeenLastCalledWith({
+      duration: 10000,
+      progress: 1,
+      time: 10000,
+    });
+    component.setProps({ active: true });
+    expect(onStart).toHaveBeenLastCalledWith({
+      duration: 10000,
+      progress: 0,
+      time: 0,
+    });
+
+    component.unmount();
+  });
+
+  test('active prop changed - before timer complete', () => {
+    expect.assertions(4);
+
+    const onStart = jest.fn();
+    const onStop = jest.fn();
+    const onTimeUpdate = jest.fn();
+
+    component = mount((
+      <Timer
+        active
+        onStart={onStart}
+        onStop={onStop}
+        onTimeUpdate={onTimeUpdate}
+      />
+    ), {
+      attachTo: document.getElementById('root'),
+    });
+
+    expect(onStart).toHaveBeenLastCalledWith({
+      duration: 10000,
+      progress: 0,
+      time: 0,
+    });
+    clock.tick(2000);
+    expect(onTimeUpdate).toHaveBeenLastCalledWith({
+      duration: 10000,
+      progress: 0.2,
+      time: 2000,
+    });
+    component.setProps({ active: false });
+    expect(onStop).toHaveBeenLastCalledWith({
+      duration: 10000,
+      progress: 0.2,
+      time: 2000,
+    });
+    component.setProps({ active: true });
+    expect(onStart).toHaveBeenLastCalledWith({
+      duration: 10000,
+      progress: 0.2,
+      time: 2000,
+    });
 
     component.unmount();
   });