Fix: Tests

box · Nov 15, 2018 · e5b9bdf · e5b9bdf
1 parent 0ae26c9
commit e5b9bdf
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 20 deletions.
diff --git a/src/controllers/DrawingModeController.js b/src/controllers/DrawingModeController.js
@@ -92,7 +92,10 @@ class DrawingModeController extends AnnotationModeController {
      * @return {void}
      */
     cancelDrawing(): void {
-        this.destroyThread(this.currentThread);
+        if (this.currentThread) {
+            this.destroyThread(this.currentThread);
+        }
+
         this.exit();
     }
 

diff --git a/src/controllers/PointModeController.js b/src/controllers/PointModeController.js
@@ -64,7 +64,10 @@ class PointModeController extends AnnotationModeController {
         this.annotatedElement.classList.remove(CLASS_ANNOTATION_POINT_MODE);
 
         const thread = this.getThreadByID(this.pendingThreadID);
-        this.destroyThread(thread);
+        if (thread) {
+            this.destroyThread(thread);
+        }
+
         this.pendingThreadID = null;
     }
 

diff --git a/src/controllers/__tests__/DrawingModeController-test.js b/src/controllers/__tests__/DrawingModeController-test.js
@@ -88,31 +88,20 @@ describe('controllers/DrawingModeController', () => {
     });
 
     describe('cancelDrawing()', () => {
-        beforeEach(() => {
-            controller.exit = jest.fn();
-            controller.unregisterThread = jest.fn();
-            thread = new DrawingThread();
-        });
-
         it('should exit drawing mode', () => {
-            controller.cancelDrawing();
-            expect(controller.exit).toBeCalled();
-            expect(controller.unregisterThread).not.toBeCalled();
-        });
-
-        it('should destroy the current thread', () => {
+            controller.exit = jest.fn();
+            controller.destroyThread = jest.fn();
             controller.currentThread = thread;
+
             controller.cancelDrawing();
             expect(controller.exit).toBeCalled();
-            expect(controller.unregisterThread).toBeCalled();
-            expect(controller.currentThread.destroy).toBeCalled();
+            expect(controller.destroyThread).toBeCalled();
         });
     });
 
     describe('postDrawing()', () => {
         beforeEach(() => {
             controller.exit = jest.fn();
-            thread = new DrawingThread();
             thread.state = STATES.pending;
         });
 

diff --git a/src/controllers/__tests__/PointModeController-test.js b/src/controllers/__tests__/PointModeController-test.js
@@ -91,22 +91,23 @@ describe('controllers/PointModeController', () => {
     });
 
     describe('resetMode()', () => {
-        beforeEach(() => {
+        it('should reset annotation mode', () => {
             // Set up annotation mode
             controller.annotatedElement = document.createElement('div');
             controller.annotatedElement.classList.add(CLASS_ANNOTATION_MODE);
             controller.headerElement = document.createElement('div');
 
             controller.buttonEl = document.createElement('button');
             controller.buttonEl.classList.add(CLASS_ACTIVE);
-        });
+            controller.getThreadByID = jest.fn().mockReturnValue(thread);
+            controller.destroyThread = jest.fn();
 
-        it('should reset annotation mode', () => {
             controller.buttonEl = document.createElement('button');
             controller.buttonEl.classList.add(CLASS_ACTIVE);
             controller.resetMode();
             expect(controller.buttonEl.classList).not.toContain(CLASS_ACTIVE);
             expect(controller.hadPendingThreads).toBeFalsy();
+            expect(controller.destroyThread).toBeCalledWith(thread);
         });
     });