Clarify test. Remove unnecessary Object.values and check for length.

zooniverse · Jan 25, 2021 · 5584bb8 · 5584bb8
1 parent d4cb613
commit 5584bb8
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 15 deletions.
diff --git a/.../SubjectViewer/components/InteractionLayer/components/PreviousMarks/PreviousMarks.spec.js b/.../SubjectViewer/components/InteractionLayer/components/PreviousMarks/PreviousMarks.spec.js
@@ -47,21 +47,26 @@ describe('Component > PreviousMarks', function () {
     })
 
     it('should pass along the correct number of marks per task by frame', function () {
+      const firstTaskAnnotationsFirstFrameFirstMark = interactionTaskAnnotations[0].value[0]
+      const secondTaskAnnotationsFirstFrameFirstMark = interactionTaskAnnotations[1].value[0]
+      const secondTaskAnnotationsFirstFrameSecondMark = interactionTaskAnnotations[1].value[1]
+      const secondTaskAnnotationsSecondFrameFirstMark = interactionTaskAnnotations[1].value[2]
+      const secondTaskAnnotationsSecondFrameSecondMark = interactionTaskAnnotations[1].value[3]
       const wrapper = shallow(<PreviousMarks interactionTaskAnnotations={interactionTaskAnnotations} />)
-      let firstAnnotationMarks = wrapper.find(DrawingToolMarks).first().props().marks
-      let secondAnnotationMarks = wrapper.find(DrawingToolMarks).last().props().marks
-      expect(firstAnnotationMarks).to.have.lengthOf(1)
-      expect(firstAnnotationMarks[0]).to.deep.equal(interactionTaskAnnotations[0].value[0])
-      expect(secondAnnotationMarks).to.have.lengthOf(2)
-      expect(secondAnnotationMarks[0]).to.deep.equal(interactionTaskAnnotations[1].value[0])
-      expect(secondAnnotationMarks[1]).to.deep.equal(interactionTaskAnnotations[1].value[1])
+      let firstTaskAnnotationRenderedMarks = wrapper.find(DrawingToolMarks).first().props().marks
+      let secondTaskAnnotationRenderedMarks = wrapper.find(DrawingToolMarks).last().props().marks
+      expect(firstTaskAnnotationRenderedMarks).to.have.lengthOf(1)
+      expect(firstTaskAnnotationRenderedMarks[0]).to.deep.equal(firstTaskAnnotationsFirstFrameFirstMark)
+      expect(secondTaskAnnotationRenderedMarks).to.have.lengthOf(2)
+      expect(secondTaskAnnotationRenderedMarks[0]).to.deep.equal(secondTaskAnnotationsFirstFrameFirstMark)
+      expect(secondTaskAnnotationRenderedMarks[1]).to.deep.equal(secondTaskAnnotationsFirstFrameSecondMark)
       wrapper.setProps({ frame: 1 })
-      firstAnnotationMarks = wrapper.find(DrawingToolMarks).first().props().marks
-      secondAnnotationMarks = wrapper.find(DrawingToolMarks).last().props().marks
-      expect(firstAnnotationMarks).to.have.lengthOf(0)
-      expect(secondAnnotationMarks).to.have.lengthOf(2)
-      expect(secondAnnotationMarks[0]).to.deep.equal(interactionTaskAnnotations[1].value[2])
-      expect(secondAnnotationMarks[1]).to.deep.equal(interactionTaskAnnotations[1].value[3])
+      firstTaskAnnotationRenderedMarks = wrapper.find(DrawingToolMarks).first().props().marks
+      secondTaskAnnotationRenderedMarks = wrapper.find(DrawingToolMarks).last().props().marks
+      expect(firstTaskAnnotationRenderedMarks).to.have.lengthOf(0)
+      expect(secondTaskAnnotationRenderedMarks).to.have.lengthOf(2)
+      expect(secondTaskAnnotationRenderedMarks[0]).to.deep.equal(secondTaskAnnotationsSecondFrameFirstMark)
+      expect(secondTaskAnnotationRenderedMarks[1]).to.deep.equal(secondTaskAnnotationsSecondFrameSecondMark)
     })
   })
 

diff --git a/packages/lib-classifier/src/store/WorkflowStepStore.js b/packages/lib-classifier/src/store/WorkflowStepStore.js
@@ -51,8 +51,8 @@ const WorkflowStepStore = types
 
     findTasksByType (type) {
       const tasksByType = Array.from(self.steps).map(([stepKey, step]) => {
-        if (step?.tasks) {
-          return Object.values(step.tasks).filter(task => {
+        if (step?.tasks && step.tasks.length > 0) {
+          return step.tasks.filter(task => {
             return task.type === type
           })
         }