@coorpacademy/app-review 0.4.5 → 0.5.1-alpha.26

package/src/views/slides/test/index.test.ts

@@ -1,6 +1,7 @@
 import test from 'ava';
 import identity from 'lodash/fp/identity';
 import omit from 'lodash/fp/omit';
+import pick from 'lodash/fp/pick';
 import set from 'lodash/fp/set';
 import {
   postProgressionResponse as createdProgression,
@@ -34,13 +35,15 @@ test('should create initial props when fetched slide is not still received', t =
       currentSlideRef: '',
       navigation: ['loader', 'slides'],
       answers: {},
+      positions: [0, 1, 2, 3, 4],
       slide: {
         sli_N1XACJobn: {
           validateButton: false,
           animateCorrectionPopin: false,
           showCorrectionPopin: false
         }
-      }
+      },
+      showQuitPopin: false
     }
   };
 
@@ -84,27 +87,22 @@ test('should create initial props when fetched slide is not still received', t =
     endReview: false,
     slides: {
       '0': {
-        hidden: false,
         position: 0,
         loading: true
       },
       '1': {
-        hidden: false,
         position: 1,
         loading: true
       },
       '2': {
-        hidden: false,
         position: 2,
         loading: true
       },
       '3': {
-        hidden: false,
         position: 3,
         loading: true
       },
       '4': {
-        hidden: false,
         position: 4,
         loading: true
       }
@@ -129,13 +127,15 @@ test('should create props when first slide is on the state', t => {
       currentSlideRef: 'sli_VJYjJnJhg',
       navigation: ['loader', 'slides'],
       answers: {},
+      positions: [0, 1, 2, 3, 4],
       slide: {
         sli_VJYjJnJhg: {
           validateButton: false,
           animateCorrectionPopin: false,
           showCorrectionPopin: false
         }
-      }
+      },
+      showQuitPopin: false
     }
   };
 
@@ -182,7 +182,6 @@ test('should create props when first slide is on the state', t => {
     animationType: undefined,
     animateCorrectionPopin: false,
     showCorrectionPopin: false,
-    hidden: false,
     position: 0,
     loading: false,
     parentContentTitle: 'From "Developing the review app" course',
@@ -200,22 +199,18 @@ test('should create props when first slide is on the state', t => {
   });
   t.deepEqual(omit(['0'], props.stack.slides), {
     '1': {
-      hidden: false,
       position: 1,
       loading: true
     },
     '2': {
-      hidden: false,
       position: 2,
       loading: true
     },
     '3': {
-      hidden: false,
       position: 3,
       loading: true
     },
     '4': {
-      hidden: false,
       position: 4,
       loading: true
     }
@@ -239,13 +234,15 @@ test('should create props when slide is on the state and user has selected answe
       currentSlideRef: 'sli_VJYjJnJhg',
       navigation: ['loader', 'slides'],
       answers: {sli_VJYjJnJhg: ['My value']},
+      positions: [0, 1, 2, 3, 4],
       slide: {
         sli_VJYjJnJhg: {
           validateButton: true,
           animateCorrectionPopin: false,
           showCorrectionPopin: false
         }
-      }
+      },
+      showQuitPopin: false
     }
   };
 
@@ -292,7 +289,6 @@ test('should create props when slide is on the state and user has selected answe
     animationType: undefined,
     animateCorrectionPopin: false,
     showCorrectionPopin: false,
-    hidden: false,
     position: 0,
     loading: false,
     parentContentTitle: 'From "Developing the review app" course',
@@ -310,22 +306,18 @@ test('should create props when slide is on the state and user has selected answe
   });
   t.deepEqual(omit(['0'], props.stack.slides), {
     '1': {
-      hidden: false,
       position: 1,
       loading: true
     },
     '2': {
-      hidden: false,
       position: 2,
       loading: true
     },
     '3': {
-      hidden: false,
       position: 3,
       loading: true
     },
     '4': {
-      hidden: false,
       position: 4,
       loading: true
     }
@@ -350,6 +342,7 @@ test('should verify props when first slide was answered correctly and next slide
       currentSlideRef: 'sli_VJYjJnJhg',
       navigation: ['loader', 'slides'],
       answers: {sli_VJYjJnJhg: ['My value']},
+      positions: [0, 1, 2, 3, 4],
       slide: {
         sli_VJYjJnJhg: {
           validateButton: false,
@@ -361,7 +354,8 @@ test('should verify props when first slide was answered correctly and next slide
           animateCorrectionPopin: false,
           showCorrectionPopin: false
         }
-      }
+      },
+      showQuitPopin: false
     }
   };
 
@@ -408,7 +402,6 @@ test('should verify props when first slide was answered correctly and next slide
     animationType: undefined,
     animateCorrectionPopin: false,
     showCorrectionPopin: false,
-    hidden: false,
     position: 0,
     loading: false,
     parentContentTitle: 'From "Developing the review app" course',
@@ -426,22 +419,18 @@ test('should verify props when first slide was answered correctly and next slide
   t.is(props.stack.validateButton.disabled, true);
   t.deepEqual(omit(['0'], props.stack.slides), {
     '1': {
-      hidden: false,
       position: 1,
       loading: true
     },
     '2': {
-      hidden: false,
       position: 2,
       loading: true
     },
     '3': {
-      hidden: false,
       position: 3,
       loading: true
     },
     '4': {
-      hidden: false,
       position: 4,
       loading: true
     }
@@ -470,6 +459,7 @@ test('should verify props when first slide was answered with error and next slid
       currentSlideRef: 'sli_VJYjJnJhg',
       navigation: ['loader', 'slides'],
       answers: {sli_VJYjJnJhg: ['My value']},
+      positions: [0, 1, 2, 3, 4],
       slide: {
         sli_VJYjJnJhg: {
           validateButton: false,
@@ -481,7 +471,8 @@ test('should verify props when first slide was answered with error and next slid
           animateCorrectionPopin: false,
           showCorrectionPopin: false
         }
-      }
+      },
+      showQuitPopin: false
     }
   };
 
@@ -542,6 +533,7 @@ test('should verify props when first slide was answered, next slide is fetched &
       currentSlideRef: 'sli_VJYjJnJhg',
       navigation: ['loader', 'slides'],
       answers: {sli_VJYjJnJhg: ['My value']},
+      positions: [0, 1, 2, 3, 4],
       slide: {
         sli_VJYjJnJhg: {
           validateButton: false,
@@ -553,7 +545,8 @@ test('should verify props when first slide was answered, next slide is fetched &
           animateCorrectionPopin: false,
           showCorrectionPopin: false
         }
-      }
+      },
+      showQuitPopin: false
     }
   };
 
@@ -611,7 +604,6 @@ test('should verify props when first slide was answered, next slide is fetched &
     animationType: undefined,
     animateCorrectionPopin: true,
     showCorrectionPopin: true,
-    hidden: false,
     position: 0,
     loading: false,
     parentContentTitle: 'From "Developing the review app" course',
@@ -630,7 +622,6 @@ test('should verify props when first slide was answered, next slide is fetched &
     animationType: undefined,
     animateCorrectionPopin: false,
     showCorrectionPopin: false,
-    hidden: false,
     position: 1,
     loading: false,
     parentContentTitle: 'From "Developing the review app" course',
@@ -639,17 +630,14 @@ test('should verify props when first slide was answered, next slide is fetched &
   t.is(props.stack.validateButton.disabled, true);
   t.deepEqual(omit(['0', '1'], props.stack.slides), {
     '2': {
-      hidden: false,
       position: 2,
       loading: true
     },
     '3': {
-      hidden: false,
       position: 3,
       loading: true
     },
     '4': {
-      hidden: false,
       position: 4,
       loading: true
     }
@@ -676,6 +664,7 @@ test('should verify props when first slide was answered incorrectly, next slide
       currentSlideRef: 'sli_VJYjJnJhg',
       navigation: ['loader', 'slides'],
       answers: {sli_VJYjJnJhg: ['My value']},
+      positions: [0, 1, 2, 3, 4],
       slide: {
         sli_VJYjJnJhg: {
           validateButton: false,
@@ -687,7 +676,8 @@ test('should verify props when first slide was answered incorrectly, next slide
           animateCorrectionPopin: false,
           showCorrectionPopin: false
         }
-      }
+      },
+      showQuitPopin: false
     }
   };
 
@@ -748,7 +738,6 @@ test('should verify props when first slide was answered incorrectly, next slide
     animationType: undefined,
     animateCorrectionPopin: true,
     showCorrectionPopin: true,
-    hidden: false,
     position: 0,
     loading: false,
     parentContentTitle: 'From "Developing the review app" course',
@@ -767,7 +756,6 @@ test('should verify props when first slide was answered incorrectly, next slide
     animationType: undefined,
     animateCorrectionPopin: false,
     showCorrectionPopin: false,
-    hidden: false,
     position: 1,
     loading: false,
     parentContentTitle: 'From "Developing the review app" course',
@@ -776,17 +764,14 @@ test('should verify props when first slide was answered incorrectly, next slide
   t.is(props.stack.validateButton.disabled, true);
   t.deepEqual(omit(['0', '1'], props.stack.slides), {
     '2': {
-      hidden: false,
       position: 2,
       loading: true
     },
     '3': {
-      hidden: false,
       position: 3,
       loading: true
     },
     '4': {
-      hidden: false,
       position: 4,
       loading: true
     }
@@ -816,6 +801,7 @@ test('should verify props when currentSlideRef has changed to nextContent of pro
         sli_VJYjJnJhg: ['Benchmark'],
         sli_VkSQroQnx: []
       },
+      positions: [-1, 0, 1, 2, 3],
       slide: {
         sli_VJYjJnJhg: {
           validateButton: false,
@@ -828,7 +814,8 @@ test('should verify props when currentSlideRef has changed to nextContent of pro
           animateCorrectionPopin: false,
           showCorrectionPopin: false
         }
-      }
+      },
+      showQuitPopin: false
     }
   };
 
@@ -868,7 +855,31 @@ test('should verify props when currentSlideRef has changed to nextContent of pro
     ]
   });
 
-  // TODO update test with props.stack validations when NEXT_SLIDE implemented
+  const propsToCheck = ['loading', 'animateCorrectionPopin', 'animationType', 'position'];
+  t.deepEqual(pick(propsToCheck, props.stack.slides[0]), {
+    loading: false,
+    animateCorrectionPopin: false,
+    animationType: 'unstack',
+    position: -1
+  });
+  t.deepEqual(pick(propsToCheck, props.stack.slides[1]), {
+    loading: false,
+    animateCorrectionPopin: false,
+    animationType: undefined,
+    position: 0
+  });
+  t.deepEqual(pick(propsToCheck, props.stack.slides[2]), {
+    loading: true,
+    position: 1
+  });
+  t.deepEqual(pick(propsToCheck, props.stack.slides[3]), {
+    loading: true,
+    position: 2
+  });
+  t.deepEqual(pick(propsToCheck, props.stack.slides[4]), {
+    loading: true,
+    position: 3
+  });
 });
 
 test('should verify props when progression is in success', t => {
@@ -904,6 +915,7 @@ test('should verify props when progression is in success', t => {
         sli_VkAzsCLKb: ['7'],
         'sli_N13-hG3kX': ['Leaderboard', 'utilisateurs', 'étoiles']
       },
+      positions: [-1, -1, -1, -1, 0],
       slide: {
         sli_VJYjJnJhg: {
           validateButton: false,
@@ -934,7 +946,8 @@ test('should verify props when progression is in success', t => {
           animateCorrectionPopin: true,
           showCorrectionPopin: true
         }
-      }
+      },
+      showQuitPopin: false
     }
   };
 
@@ -1010,6 +1023,7 @@ test('should verify props when progression has answered a current pendingSlide',
         sli_VkAzsCLKb: ['7'],
         'sli_N13-hG3kX': ['Leaderboard', 'utilisateurs', 'étoiles']
       },
+      positions: [0, -1, 1, -1, -1],
       slide: {
         sli_VJYjJnJhg: {
           validateButton: false,
@@ -1040,7 +1054,8 @@ test('should verify props when progression has answered a current pendingSlide',
           showCorrectionPopin: false,
           animationType: 'unstack'
         }
-      }
+      },
+      showQuitPopin: false
     }
   };
 
@@ -1113,6 +1128,7 @@ test('should verify props when progression still has a pendingSlide', t => {
         sli_VkAzsCLKb: ['7'],
         'sli_N13-hG3kX': ['Leaderboard', 'utilisateurs', 'étoiles']
       },
+      positions: [-1, -1, 0, -1, -1],
       slide: {
         sli_VJYjJnJhg: {
           validateButton: false,
@@ -1143,7 +1159,8 @@ test('should verify props when progression still has a pendingSlide', t => {
           showCorrectionPopin: false,
           animationType: 'unstack'
         }
-      }
+      },
+      showQuitPopin: false
     }
   };
 
@@ -1182,3 +1199,34 @@ test('should verify props when progression still has a pendingSlide', t => {
     ]
   });
 });
+
+test('should verify that props quitPopin is not undefined when popin is displayed', t => {
+  const state: StoreState = {
+    data: {
+      progression: createdProgression,
+      skills: [],
+      slides: {
+        sli_N1XACJobn: null
+      },
+      token: '1234',
+      corrections: {},
+      rank: {}
+    },
+    ui: {
+      currentSlideRef: '',
+      navigation: ['loader', 'slides'],
+      answers: {},
+      positions: [0, 1, 2, 3, 4],
+      slide: {
+        sli_N1XACJobn: {
+          validateButton: false,
+          animateCorrectionPopin: false,
+          showCorrectionPopin: false
+        }
+      },
+      showQuitPopin: true
+    }
+  };
+  const props = mapStateToSlidesProps(state, identity, identity);
+  t.not(props.quitPopin, undefined);
+});

package/src/views/slides/test/on-quit-popin.on-click.test.ts

@@ -0,0 +1,64 @@
+import test from 'ava';
+import identity from 'lodash/fp/identity';
+import {createTestStore} from '../../../actions/test/create-test-store';
+import {CLOSE_POPIN} from '../../../actions/ui/quit-popin';
+import {incorrectFreeTextPostAnswerResponse, services} from '../../../test/util/services.mock';
+import {StoreState} from '../../../reducers';
+import {mapStateToSlidesProps, QuitPopinProps} from '..';
+import {freeTextSlide} from './fixtures/free-text';
+import {qcmGraphicSlide} from './fixtures/qcm-graphic';
+
+const state: StoreState = {
+  data: {
+    progression: incorrectFreeTextPostAnswerResponse,
+    skills: [],
+    slides: {
+      sli_VJYjJnJhg: freeTextSlide,
+      sli_VkSQroQnx: qcmGraphicSlide
+    },
+    token: '1234',
+    corrections: {},
+    rank: {}
+  },
+  ui: {
+    currentSlideRef: 'sli_VJYjJnJhg',
+    navigation: ['loader', 'slides'],
+    answers: {sli_VJYjJnJhg: ['My value']},
+    positions: [0, 1, 2, 3, 4],
+    slide: {
+      sli_VJYjJnJhg: {
+        validateButton: false,
+        animateCorrectionPopin: true,
+        showCorrectionPopin: true
+      },
+      sli_VkSQroQnx: {
+        validateButton: false,
+        animateCorrectionPopin: false,
+        showCorrectionPopin: false
+      }
+    },
+    showQuitPopin: true
+  }
+};
+
+test('should dispatch CLOSE_POPIN action via the property handleOnclick of secondButton when popin is open', async t => {
+  const expectedAction = [{type: CLOSE_POPIN}];
+  const {dispatch, getState} = createTestStore(t, state, services, expectedAction);
+  const props = mapStateToSlidesProps(getState(), dispatch, identity);
+  const quitPopin = props.quitPopin as QuitPopinProps;
+  await quitPopin.secondButton.handleOnclick();
+  const updatedState = getState();
+  t.is(updatedState.ui.showQuitPopin, false);
+  t.pass();
+});
+
+test('should dispatch onQuitClick function via the property handleOnclick of firstButton when popin is open', async t => {
+  t.plan(2);
+
+  const expectedAction = [{type: CLOSE_POPIN}];
+  const {dispatch, getState} = createTestStore(t, state, services, expectedAction);
+  const props = mapStateToSlidesProps(getState(), dispatch, () => t.pass());
+  const quitPopin = props.quitPopin as QuitPopinProps;
+  await quitPopin.firstButton.handleOnclick();
+  t.pass();
+});

package/src/views/slides/test/slide.free-text.on-change.test.ts

@@ -59,13 +59,15 @@ const initialState: StoreState = {
     currentSlideRef: freeTextSlide._id,
     navigation: ['skills', 'slides'],
     answers: {},
+    positions: [0, 1, 2, 3, 4],
     slide: {
       [freeTextSlide._id]: {
         validateButton: false,
         animateCorrectionPopin: false,
         showCorrectionPopin: false
       }
-    }
+    },
+    showQuitPopin: false
   }
 };
 
@@ -101,7 +103,6 @@ test('should dispatch EDIT_BASIC action via the property onChange of a Free Text
     animationType: undefined,
     animateCorrectionPopin: false,
     showCorrectionPopin: false,
-    hidden: false,
     position: 0,
     loading: false,
     parentContentTitle: 'From "Developing the review app" course',

package/src/views/slides/test/slide.next-slide.on-click.test.ts

@@ -31,6 +31,7 @@ test('correction popin actions after click', async t => {
       currentSlideRef: 'sli_VJYjJnJhg',
       navigation: ['loader', 'slides'],
       answers: {sli_VJYjJnJhg: ['My value']},
+      positions: [0, 1, 2, 3, 4],
       slide: {
         sli_VJYjJnJhg: {
           validateButton: false,
@@ -42,7 +43,8 @@ test('correction popin actions after click', async t => {
           animateCorrectionPopin: false,
           showCorrectionPopin: false
         }
-      }
+      },
+      showQuitPopin: false
     }
   };
 
@@ -52,7 +54,9 @@ test('correction popin actions after click', async t => {
       payload: {
         animationType: 'restack',
         currentSlideRef: freeTextSlide._id,
-        nextSlideRef: qcmGraphicSlide._id
+        nextSlideRef: qcmGraphicSlide._id,
+        totalCorrectAnswers: 0,
+        answeredSlides: ['sli_VJYjJnJhg']
       }
     }
   ];
@@ -60,5 +64,9 @@ test('correction popin actions after click', async t => {
   const props = mapStateToSlidesProps(getState(), dispatch, identity);
   const correctionPopin = props.stack.correctionPopinProps as CorrectionPopinProps;
   await correctionPopin.next.onClick();
+
+  const updatedState = getState();
+  t.deepEqual(updatedState.ui.positions, [4, 0, 1, 2, 3]);
+  t.deepEqual(updatedState.ui.currentSlideRef, qcmGraphicSlide._id);
   t.pass();
 });

package/src/views/slides/test/slide.qcm-drag.on-click.test.ts

@@ -47,6 +47,7 @@ const initialState: StoreState = {
   ui: {
     currentSlideRef: qcmDragSlide._id,
     navigation: ['skills', 'slides'],
+    positions: [0, 1, 2, 3, 4],
     answers: {},
     slide: {
       [qcmDragSlide._id]: {
@@ -54,7 +55,8 @@ const initialState: StoreState = {
         animateCorrectionPopin: false,
         showCorrectionPopin: false
       }
-    }
+    },
+    showQuitPopin: false
   }
 };
 
@@ -75,7 +77,6 @@ test('should dispatch EDIT_QCM_DRAG action via the property onClick of a QCM Dra
     animationType: undefined,
     animateCorrectionPopin: false,
     showCorrectionPopin: false,
-    hidden: false,
     position: 0,
     loading: false,
     parentContentTitle: 'From "Using redux" chapter',

package/src/views/slides/test/slide.qcm-graphic.on-click.test.ts

@@ -47,6 +47,7 @@ const initialState: StoreState = {
   ui: {
     currentSlideRef: qcmGraphicSlide._id,
     navigation: ['skills', 'slides'],
+    positions: [0, 1, 2, 3, 4],
     answers: {},
     slide: {
       [qcmGraphicSlide._id]: {
@@ -54,7 +55,8 @@ const initialState: StoreState = {
         animateCorrectionPopin: false,
         showCorrectionPopin: false
       }
-    }
+    },
+    showQuitPopin: false
   }
 };
 
@@ -75,7 +77,6 @@ test('should dispatch EDIT_QCM_GRAPHIC action via the property onClick of a QCM
     animationType: undefined,
     animateCorrectionPopin: false,
     showCorrectionPopin: false,
-    hidden: false,
     position: 0,
     loading: false,
     parentContentTitle: 'From "Developing the review app" course',

package/src/views/slides/test/slide.qcm.on-click.test.ts

@@ -47,6 +47,7 @@ const initialState: StoreState = {
   ui: {
     currentSlideRef: qcmSlide._id,
     navigation: ['skills', 'slides'],
+    positions: [0, 1, 2, 3, 4],
     answers: {},
     slide: {
       [qcmSlide._id]: {
@@ -54,7 +55,8 @@ const initialState: StoreState = {
         animateCorrectionPopin: false,
         showCorrectionPopin: false
       }
-    }
+    },
+    showQuitPopin: false
   }
 };
 
@@ -77,7 +79,6 @@ test('should dispatch EDIT_QCM action via the property onClick of a QCM slide',
     animationType: undefined,
     animateCorrectionPopin: false,
     showCorrectionPopin: false,
-    hidden: false,
     position: 0,
     loading: false,
     parentContentTitle: 'From "Developing the review app" course',

package/src/views/slides/test/slide.slider.on-change.test.ts

@@ -47,6 +47,7 @@ const initialState: StoreState = {
   ui: {
     currentSlideRef: sliderSlide._id,
     navigation: ['skills', 'slides'],
+    positions: [0, 1, 2, 3, 4],
     answers: {},
     slide: {
       [sliderSlide._id]: {
@@ -54,7 +55,8 @@ const initialState: StoreState = {
         animateCorrectionPopin: false,
         showCorrectionPopin: false
       }
-    }
+    },
+    showQuitPopin: false
   }
 };
 
@@ -75,7 +77,6 @@ test('should dispatch EDIT_SLIDER action via the property onChange of a Slider s
     animationType: undefined,
     animateCorrectionPopin: false,
     showCorrectionPopin: false,
-    hidden: false,
     position: 0,
     loading: false,
     parentContentTitle: 'From "Developing the review app" course',