@coorpacademy/app-review 0.5.3 → 0.5.4

package/lib/reducers/data/rank.js

@@ -1,35 +1,26 @@
-import { get, isNull, isUndefined, pipe, set, unset, update } from 'lodash/fp';
-import { RANK_FETCH_START_REQUEST, RANK_FETCH_START_SUCCESS, RANK_FETCH_START_FAILURE, RANK_FETCH_END_REQUEST, RANK_FETCH_END_SUCCESS, RANK_FETCH_END_FAILURE } from '../../actions/api/fetch-rank';
-var initialState = {};
+import set from 'lodash/fp/set';
+import { POST_PROGRESSION_SUCCESS } from '../../actions/api/post-progression';
+import { RANK_FETCH_START_SUCCESS, RANK_FETCH_END_SUCCESS } from '../../actions/api/fetch-rank';
+var initialState = {
+    start: Number.NaN,
+    end: Number.NaN
+};
 var reducer = function (
 // eslint-disable-next-line default-param-last
 state, action) {
     if (state === void 0) { state = initialState; }
     switch (action.type) {
-        case RANK_FETCH_START_REQUEST: {
-            return update('start', function (startRank) { return (isUndefined(startRank) ? null : startRank); }, state);
+        case POST_PROGRESSION_SUCCESS: {
+            return initialState;
         }
         case RANK_FETCH_START_SUCCESS: {
             var payload = action.payload;
             return set('start', payload.rank, state);
         }
-        case RANK_FETCH_START_FAILURE: {
-            if (pipe(get('start'), isNull)(state))
-                return unset('start', state);
-            return state;
-        }
-        case RANK_FETCH_END_REQUEST: {
-            return update('end', function (endRank) { return (isUndefined(endRank) ? null : endRank); }, state);
-        }
         case RANK_FETCH_END_SUCCESS: {
             var payload = action.payload;
             return set('end', payload.rank, state);
         }
-        case RANK_FETCH_END_FAILURE: {
-            if (pipe(get('end'), isNull)(state))
-                return unset('end', state);
-            return state;
-        }
         default:
             return state;
     }

package/lib/reducers/index.d.ts

@@ -19,6 +19,12 @@ declare const _default: import("redux").Reducer<import("redux").CombinedState<{
         answers: import("./ui/answers").UIAnswerState;
         slide: import("./ui/slide").UISlideState;
         positions: import("./ui/positions").UIPositionState;
+        showQuitPopin: boolean;
+        showCongrats: boolean;
     }>;
-}>, import("./data/corrections").CorrectionsAction | import("../actions/ui/slides").SetCurrentSlideAction | import("../actions/api/fetch-rank").RankAction | import("../actions/api/post-answer").PostAnswerRequestAction | import("../actions/api/post-answer").PostAnswerSuccessAction | import("../actions/api/post-progression").ReceivedProgression | import("../actions/api/fetch-skills").ReceivedSkills | import("./data/slides").SlidesAction | import("../actions/data/token").StoreToken | import("../actions/ui/next-slide").NextSlideAction | import("../actions/ui/navigation").NavigateTo | import("../actions/ui/navigation").NavigateBack | import("../actions/ui/answers").EditAnswerAction>;
+}>, import("./data/corrections").CorrectionsAction | import("../actions/ui/slides").SetCurrentSlideAction | import("../actions/api/fetch-rank").RankAction | import("../actions/api/post-answer").PostAnswerRequestAction | import("../actions/api/post-answer").PostAnswerSuccessAction | import("../actions/api/post-progression").ReceivedProgression | import("../actions/api/fetch-skills").ReceivedSkills | import("./data/slides").SlidesAction | import("../actions/data/token").StoreToken | import("../actions/ui/next-slide").NextSlideAction | import("../actions/ui/navigation").NavigateTo | import("../actions/ui/navigation").NavigateBack | import("../actions/ui/answers").EditAnswerAction | {
+    type: "@@ui/OPEN_POPIN";
+} | {
+    type: "@@ui/CLOSE_POPIN";
+}>;
 export default _default;

package/lib/reducers/ui/index.d.ts

@@ -3,12 +3,16 @@ import { NavigationState } from './navigation';
 import { UIAnswerState } from './answers';
 import { UIPositionState } from './positions';
 import { UISlideState } from './slide';
+import { type ShowQuitPopinState } from './quit-popin';
+import { UIShowCongratsState } from './show-congrats';
 export declare type UIState = {
     currentSlideRef: CurrentSlideRefState;
     navigation: NavigationState;
     answers: UIAnswerState;
     slide: UISlideState;
     positions: UIPositionState;
+    showQuitPopin: ShowQuitPopinState;
+    showCongrats: UIShowCongratsState;
 };
 declare const _default: import("redux").Reducer<import("redux").CombinedState<{
     currentSlideRef: string;
@@ -16,5 +20,11 @@ declare const _default: import("redux").Reducer<import("redux").CombinedState<{
     answers: UIAnswerState;
     slide: UISlideState;
     positions: UIPositionState;
-}>, import("../../actions/api/fetch-correction").ReceivedCorrection | import("../../actions/ui/slides").SetCurrentSlideAction | import("../../actions/api/fetch-slide").FetchSlide | import("../../actions/api/post-answer").PostAnswerRequestAction | import("../../actions/api/post-progression").ReceivedProgression | import("../../actions/ui/next-slide").NextSlideAction | import("../../actions/ui/navigation").NavigateTo | import("../../actions/ui/navigation").NavigateBack | import("../../actions/ui/answers").EditAnswerAction>;
+    showQuitPopin: boolean;
+    showCongrats: boolean;
+}>, import("../../actions/api/fetch-correction").ReceivedCorrection | import("../../actions/ui/slides").SetCurrentSlideAction | import("../../actions/api/fetch-slide").FetchSlide | import("../../actions/api/post-answer").PostAnswerRequestAction | import("../../actions/api/post-progression").ReceivedProgression | import("../../actions/ui/next-slide").NextSlideAction | import("../../actions/ui/navigation").NavigateTo | import("../../actions/ui/navigation").NavigateBack | import("../../actions/ui/answers").EditAnswerAction | {
+    type: "@@ui/OPEN_POPIN";
+} | {
+    type: "@@ui/CLOSE_POPIN";
+}>;
 export default _default;

package/lib/reducers/ui/index.js

@@ -4,10 +4,14 @@ import navigation from './navigation';
 import answers from './answers';
 import positions from './positions';
 import slide from './slide';
+import showQuitPopin from './quit-popin';
+import showCongrats from './show-congrats';
 export default combineReducers({
     currentSlideRef: currentSlideRef,
     navigation: navigation,
     answers: answers,
     slide: slide,
-    positions: positions
+    positions: positions,
+    showQuitPopin: showQuitPopin,
+    showCongrats: showCongrats
 });

package/lib/reducers/ui/navigation.js

@@ -25,5 +25,4 @@ state, action) {
             return state;
     }
 };
-// -----------------------------------------------------------------------------
 export default reducer;

package/lib/reducers/ui/positions.js

@@ -13,7 +13,9 @@ state, action) {
             return initialState;
         }
         case NEXT_SLIDE: {
-            var _a = action.payload, totalCorrectAnswers = _a.totalCorrectAnswers, answeredSlides = _a.answeredSlides, currentSlideRef_1 = _a.currentSlideRef, animationType = _a.animationType;
+            var _a = action.payload, totalCorrectAnswers = _a.totalCorrectAnswers, answeredSlides = _a.answeredSlides, currentSlideRef_1 = _a.currentSlideRef, animationType = _a.animationType, nextSlideRef = _a.nextSlideRef;
+            if (nextSlideRef === 'successExitNode')
+                return state;
             var nextCurrentSlidePosition = animationType === 'unstack' ? -1 : 4 - totalCorrectAnswers;
             var currentSlideIndex = findIndex(function (ref) { return ref === currentSlideRef_1; }, answeredSlides);
             var newState = map(function (position) { return (position === -1 ? position : position - 1); }, state);

package/lib/reducers/ui/quit-popin.d.ts

@@ -0,0 +1,4 @@
+import { closeQuitPopin, openQuitPopin } from '../../actions/ui/quit-popin';
+export declare type ShowQuitPopinState = boolean;
+declare const reducer: (state: boolean | undefined, action: typeof openQuitPopin | typeof closeQuitPopin) => ShowQuitPopinState;
+export default reducer;

package/lib/reducers/ui/quit-popin.js

@@ -0,0 +1,17 @@
+import { CLOSE_POPIN, OPEN_POPIN } from '../../actions/ui/quit-popin';
+var reducer = function (
+// eslint-disable-next-line default-param-last
+state, action) {
+    if (state === void 0) { state = false; }
+    switch (action.type) {
+        case OPEN_POPIN: {
+            return true;
+        }
+        case CLOSE_POPIN: {
+            return false;
+        }
+        default:
+            return state;
+    }
+};
+export default reducer;

package/lib/reducers/ui/show-congrats.d.ts

@@ -0,0 +1,5 @@
+import { NextSlideAction } from '../../actions/ui/next-slide';
+import { ReceivedProgression } from '../../actions/api/post-progression';
+export declare type UIShowCongratsState = boolean;
+declare const reducer: (state: boolean | undefined, action: NextSlideAction | ReceivedProgression) => UIShowCongratsState;
+export default reducer;

package/lib/reducers/ui/show-congrats.js

@@ -0,0 +1,21 @@
+import { NEXT_SLIDE } from '../../actions/ui/next-slide';
+import { POST_PROGRESSION_SUCCESS } from '../../actions/api/post-progression';
+var reducer = function (
+// eslint-disable-next-line default-param-last
+state, action) {
+    if (state === void 0) { state = false; }
+    switch (action.type) {
+        case POST_PROGRESSION_SUCCESS: {
+            return false;
+        }
+        case NEXT_SLIDE: {
+            var nextSlideRef = action.payload.nextSlideRef;
+            if (nextSlideRef === 'successExitNode')
+                return true;
+            return false;
+        }
+        default:
+            return state;
+    }
+};
+export default reducer;

package/lib/reducers/ui/slide.js

@@ -36,7 +36,10 @@ state, action) {
             return pipe(set([action.meta.slideRef, 'animateCorrectionPopin'], true), set([action.meta.slideRef, 'showCorrectionPopin'], true))(state);
         }
         case NEXT_SLIDE: {
-            return pipe(set([action.payload.currentSlideRef, 'animateCorrectionPopin'], false), set([action.payload.currentSlideRef, 'animationType'], action.payload.animationType))(state);
+            var _a = action.payload, currentSlideRef = _a.currentSlideRef, nextSlideRef = _a.nextSlideRef;
+            if (nextSlideRef === 'successExitNode')
+                return state;
+            return pipe(set([currentSlideRef, 'animateCorrectionPopin'], false), set([currentSlideRef, 'animationType'], action.payload.animationType))(state);
         }
         default:
             return state;

package/lib/types/common.d.ts

@@ -77,17 +77,19 @@ export declare type ProgressionAnswerItem = {
     slideRef: string;
     answer: string[];
 };
+export declare type SlideContent = {
+    type: 'slide';
+    ref: string;
+};
+export declare type SuccessNodeContent = {
+    type: 'success';
+    ref: 'successExitNode';
+};
 export declare type ProgressionState = {
     allAnswers: ProgressionAnswerItem[];
-    content?: {
-        ref: string;
-        type: string;
-    };
+    content?: SlideContent;
     isCorrect: boolean;
-    nextContent: {
-        type: 'success' | 'slide';
-        ref: 'successExitNode' | string;
-    };
+    nextContent: SlideContent | SuccessNodeContent;
     pendingSlides: string[];
     slides: string[];
     step: {

package/lib/views/slides/index.d.ts

@@ -40,6 +40,15 @@ declare type CorrectionPopinNext = {
     ariaLabel: string;
     onClick: Function;
 };
+declare type QuitPopinButton = {
+    label: string;
+    type: string;
+    customStyle?: {
+        color: string;
+    };
+    handleOnclick: Function;
+    ariaLabel: string;
+};
 export declare type CorrectionPopinProps = {
     klf?: CorrectionPopinKlf;
     information: CorrectionPopinInformation;
@@ -47,6 +56,14 @@ export declare type CorrectionPopinProps = {
     resultLabel: string;
     type: 'right' | 'wrong';
 };
+export declare type QuitPopinProps = {
+    content: string;
+    icon: string;
+    mode: string;
+    descriptionText: string;
+    firstButton: QuitPopinButton;
+    secondButton: QuitPopinButton;
+};
 export declare type SlidesViewProps = {
     header: {
         mode: string;
@@ -67,25 +84,56 @@ export declare type SlidesViewProps = {
         endReview: boolean;
     };
     reviewBackgroundAriaLabel?: string;
-    congrats?: {
-        'aria-label'?: string;
-        'data-name'?: string;
-        animationLottie: unknown;
-        title: string;
-        cardCongratsStar: unknown;
-        cardCongratsRank: unknown;
-        buttonRevising: {
-            'aria-label'?: string;
-            label: string;
-            onClick: Function;
-            type: string;
-        };
-        buttonRevisingSkill: {
-            'aria-label'?: string;
-            label: string;
-            onClick: Function;
-            type: string;
-        };
+    congrats?: CongratsProps;
+    quitPopin?: QuitPopinProps;
+};
+declare type LottieAnimationProps = {
+    'aria-label': string;
+    'data-name'?: string;
+    animationSrc: string;
+    loop?: boolean;
+    rendererSettings?: {
+        hideOnTransparent?: boolean;
+        className?: string;
+    };
+    height?: number;
+    width?: number;
+    className?: number;
+    ie11ImageBackup: string;
+    backupImageClassName?: string;
+    autoplay?: boolean;
+    animationControl?: 'play' | 'pause' | 'stop' | 'loading';
+};
+export declare type CongratsCardProps = {
+    'aria-label': string;
+    'data-name': string;
+    animationLottie: LottieAnimationProps;
+    iconAriaLabel: string;
+    className?: string;
+    cardType: string;
+    reviewCardTitle: string;
+    reviewCardValue: string;
+    rankSuffix?: string;
+    timerAnimation: number;
+};
+export declare type CongratsProps = {
+    'aria-label': string;
+    'data-name': 'review-congrats';
+    animationLottie: LottieAnimationProps;
+    title: string;
+    cardCongratsStar: CongratsCardProps;
+    cardCongratsRank?: CongratsCardProps;
+    buttonRevising?: {
+        'aria-label': string;
+        label: string;
+        onClick: Function;
+        type: string;
+    };
+    buttonRevisingSkill?: {
+        label: string;
+        'aria-label': string;
+        onClick: Function;
+        type: string;
     };
 };
 export declare const initialState: SlidesStack;

package/lib/views/slides/index.js

@@ -17,6 +17,7 @@ import reduce from 'lodash/fp/reduce';
 import set from 'lodash/fp/set';
 import toInteger from 'lodash/fp/toInteger';
 import join from 'lodash/fp/join';
+import { closeQuitPopin, openQuitPopin } from '../../actions/ui/quit-popin';
 import { getProgressionSlidesRefs } from '../../common';
 import { postAnswer } from '../../actions/api/post-answer';
 import { nextSlide } from '../../actions/ui/next-slide';
@@ -26,7 +27,18 @@ var ICON_VALUES = {
     wrong: 'wrong',
     'no-answer': 'no-answer'
 };
-// TODO replace this, position no more needed
+var confettiAnimation = {
+    'aria-label': 'aria lottie',
+    'data-name': 'default-lottie',
+    className: undefined,
+    animationSrc: 'https://static-staging.coorpacademy.com/animations/review/confetti.json',
+    loop: undefined,
+    autoplay: true,
+    rendererSettings: {
+        hideOnTransparent: false
+    },
+    ie11ImageBackup: 'https://static-staging.coorpacademy.com/animations/review/conffeti_congrats.svg'
+};
 export var initialState = {
     '0': {
         position: 0,
@@ -49,8 +61,17 @@ export var initialState = {
         loading: true
     }
 };
+var getCurrentSlideRef = function (state) {
+    var currentSlideRef = get(['ui', 'currentSlideRef'], state);
+    var endReview = currentSlideRef === 'successExitNode';
+    if (!endReview)
+        return currentSlideRef;
+    var progression = state.data.progression;
+    var content = progression.state.content;
+    return content.ref;
+};
 var buildStackSlides = function (state, dispatch) {
-    var currentSlideRef = state.ui.currentSlideRef;
+    var currentSlideRef = getCurrentSlideRef(state);
     var progression = state.data.progression;
     if (!currentSlideRef || !progression)
         return initialState;
@@ -164,16 +185,112 @@ var getCorrectionPopinProps = function (dispatch) {
         };
     };
 };
+var buildQuitPopinProps = function (dispatch) {
+    return function (onQuitClick) {
+        return {
+            content: "Tu t'en vas d\u00E9j\u00E0 ?",
+            icon: "MoonRocket",
+            mode: 'alert',
+            descriptionText: "Tu vas t'en sortir ! Si tu arr\u00EAtes maintenant, tu vas perdre ta progression.",
+            firstButton: {
+                label: 'Arrêter ma session',
+                type: 'tertiary',
+                customStyle: {
+                    color: '#ED3436'
+                },
+                handleOnclick: onQuitClick,
+                ariaLabel: 'Stop session'
+            },
+            secondButton: {
+                label: "Continuer d'apprendre",
+                type: 'primary',
+                handleOnclick: function () {
+                    dispatch(closeQuitPopin);
+                },
+                ariaLabel: 'Continue review'
+            }
+        };
+    };
+};
+var buildRankCard = function (rank) {
+    return {
+        'aria-label': 'Review Card Congrats Container',
+        'data-name': 'card-rank',
+        animationLottie: {
+            'aria-label': 'aria lottie',
+            'data-name': 'default-lottie',
+            animationSrc: 'https://static-staging.coorpacademy.com/animations/review/rank.json',
+            loop: true,
+            autoplay: true,
+            ie11ImageBackup: 'https://static-staging.coorpacademy.com/animations/review/rank_icon_congrats.svg'
+        },
+        cardType: 'card-rank',
+        iconAriaLabel: 'Image without information',
+        className: undefined,
+        reviewCardTitle: 'You are now',
+        reviewCardValue: "".concat(rank),
+        rankSuffix: 'th',
+        timerAnimation: 200
+    };
+};
+var buildCongratsProps = function (state) {
+    if (!state.ui.showCongrats)
+        return;
+    var progression = state.data.progression;
+    var stars = progression.state.stars;
+    var cardCongratsStar = {
+        'aria-label': 'Review Card Congrats Container',
+        'data-name': 'card-star',
+        animationLottie: {
+            'aria-label': 'aria lottie',
+            'data-name': 'default-lottie',
+            className: undefined,
+            animationSrc: 'https://static-staging.coorpacademy.com/animations/review/star.json',
+            loop: false,
+            autoplay: undefined,
+            rendererSettings: {
+                hideOnTransparent: false
+            },
+            ie11ImageBackup: 'https://static-staging.coorpacademy.com/animations/review/stars_icon_congrats.svg'
+        },
+        iconAriaLabel: 'Image without information',
+        className: undefined,
+        cardType: 'card-star',
+        reviewCardTitle: 'You have won',
+        reviewCardValue: "".concat(stars),
+        timerAnimation: 200
+    };
+    var _a = state.data.rank, start = _a.start, end = _a.end;
+    var newRank = start - end;
+    var cardCongratsRank = !Number.isNaN(newRank) && newRank > 0 ? buildRankCard(end) : undefined;
+    return {
+        'aria-label': 'Review Congratulations',
+        'data-name': 'review-congrats',
+        animationLottie: confettiAnimation,
+        title: 'Congratulations!',
+        cardCongratsStar: cardCongratsStar,
+        cardCongratsRank: cardCongratsRank,
+        buttonRevising: undefined,
+        buttonRevisingSkill: undefined // TODO make boutons and actions
+    };
+};
+var isEndOfProgression = function (progression) {
+    if (!progression)
+        return false;
+    return progression.state.nextContent.ref === 'successExitNode';
+};
 export var mapStateToSlidesProps = function (state, dispatch, onQuitClick) {
-    var currentSlideRef = get(['ui', 'currentSlideRef'], state);
+    var currentSlideRef = getCurrentSlideRef(state);
+    var endReview = isEndOfProgression(state.data.progression);
     var correction = get(['data', 'corrections', currentSlideRef], state);
     var isCorrect = get(['data', 'progression', 'state', 'isCorrect'], state);
     var klf = getOr('', ['data', 'slides', currentSlideRef, 'klf'], state);
+    var showQuitPopin = get(['ui', 'showQuitPopin'], state);
     return {
         header: {
             mode: '__revision_mode',
             skillName: '__agility',
-            onQuitClick: onQuitClick,
+            onQuitClick: function () { return dispatch(openQuitPopin); },
             'aria-label': 'aria-header-wrapper',
             closeButtonAriaLabel: 'aria-close-button',
             steps: buildStepItems(state)
@@ -188,8 +305,9 @@ export var mapStateToSlidesProps = function (state, dispatch, onQuitClick) {
                 }
             },
             correctionPopinProps: correction && getCorrectionPopinProps(dispatch)(isCorrect, correction.correctAnswer, klf),
-            endReview: false
+            endReview: endReview && state.ui.showCongrats
         },
-        congrats: undefined
+        congrats: buildCongratsProps(state),
+        quitPopin: showQuitPopin ? buildQuitPopinProps(dispatch)(onQuitClick) : undefined
     };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coorpacademy/app-review",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "description": "",
   "engines": {
     "node": ">=16.15.0"
@@ -42,7 +42,7 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@coorpacademy/components": "10.24.2",
+    "@coorpacademy/components": "10.24.3",
     "@coorpacademy/redux-task": "1.1.6",
     "cross-fetch": "^3.1.5",
     "jwt-decode": "^3.1.2",
@@ -77,5 +77,5 @@
     "webpack-cli": "^4.10.0",
     "webpack-dev-server": "^4.11.1"
   },
-  "gitHead": "90d579426a1435f4eb29884b34623ec4adbb4d70"
+  "gitHead": "9e64ba973f7219fca6b39876f2e64d423356c721"
 }

package/src/actions/api/fetch-rank.ts

@@ -37,6 +37,13 @@ export type RankAction = RankRequestAction | RankSuccessAction | RankFailureActi
 type RankStart = [RankFetchStartRequestType, RankFetchStartSuccessType, RankFetchStartFailureType];
 type RankEnd = [RankFetchEndRequestType, RankFetchEndSuccessType, RankFetchEndFailureType];
 
+const bailout =
+  (path: string) =>
+  (state: StoreState): boolean => {
+    const value = get(path, state);
+    return !Number.isNaN(value);
+  };
+
 export const fetchRank = (
   dispatch: Dispatch,
   getState: () => StoreState,
@@ -51,7 +58,7 @@ export const fetchRank = (
       const token = get(['data', 'token'], state);
       return services.fetchRank(token);
     },
-    bailout: path ? (state: StoreState): boolean => !!get(path, state) : undefined
+    bailout: path ? bailout(path) : undefined
   });
 
   return dispatch(action);

package/src/actions/api/test/fetch-correction.test.ts

@@ -30,9 +30,10 @@ const initialState: StoreState = {
     skills: [{skillRef, custom: false, name: skillRef, slidesToReview: 5}],
     token: '1234',
     corrections: {},
-    rank: {}
+    rank: {start: 10, end: Number.NaN}
   },
   ui: {
+    showCongrats: false,
     currentSlideRef: freeTextSlide._id,
     navigation: ['skills', 'slides'],
     answers: {[freeTextSlide.universalRef]: answer},
@@ -43,7 +44,8 @@ const initialState: StoreState = {
         animateCorrectionPopin: false,
         showCorrectionPopin: false
       }
-    }
+    },
+    showQuitPopin: false
   }
 };
 

package/src/actions/api/test/fetch-rank.test.ts

@@ -1,4 +1,5 @@
 import test from 'ava';
+import set from 'lodash/fp/set';
 import type {Services} from '../../../types/common';
 import type {StoreState} from '../../../reducers';
 import {
@@ -21,19 +22,21 @@ const initialState: StoreState = {
     skills: [],
     token: '1234',
     corrections: {},
-    rank: {}
+    rank: {start: Number.NaN, end: Number.NaN}
   },
   ui: {
+    showCongrats: false,
     positions: [0, 1, 2, 3, 4],
     currentSlideRef: '',
     navigation: [],
     answers: {},
-    slide: {}
+    slide: {},
+    showQuitPopin: false
   }
 };
 
 test('should dispatch FETCH_START_SUCCESS action when fetchStartRank returns the start rank', async t => {
-  t.plan(3);
+  t.plan(4);
 
   const services: Services = {
     ...mockedServices,
@@ -50,8 +53,11 @@ test('should dispatch FETCH_START_SUCCESS action when fetchStartRank returns the
     }
   ];
 
-  const {dispatch} = createTestStore(t, initialState, services, expectedActions);
+  const {dispatch, getState} = createTestStore(t, initialState, services, expectedActions);
   await dispatch(fetchStartRank);
+
+  const newState = getState();
+  t.deepEqual(newState.data.rank, {start: 93, end: Number.NaN});
 });
 
 test('should dispatch FETCH_START_FAILURE action when fetchStartRank fails', async t => {
@@ -80,13 +86,13 @@ test('should dispatch FETCH_START_FAILURE action when fetchStartRank fails', asy
 });
 
 test('should dispatch FETCH_END_SUCCESS action when fetchEndRank returns the end rank', async t => {
-  t.plan(3);
+  t.plan(4);
 
   const services: Services = {
     ...mockedServices,
     fetchRank: token => {
       t.is(token, '1234');
-      return Promise.resolve({rank: 93});
+      return Promise.resolve({rank: 90});
     }
   };
 
@@ -94,13 +100,16 @@ test('should dispatch FETCH_END_SUCCESS action when fetchEndRank returns the end
     {type: RANK_FETCH_END_REQUEST},
     {
       type: RANK_FETCH_END_SUCCESS,
-      payload: {rank: 93}
+      payload: {rank: 90}
     }
   ];
 
-  const {dispatch} = createTestStore(t, initialState, services, expectedActions);
+  const _initialState = set('data.rank.start', 93, initialState);
+  const {dispatch, getState} = createTestStore(t, _initialState, services, expectedActions);
 
   await dispatch(fetchEndRank);
+  const newState = getState();
+  t.deepEqual(newState.data.rank, {start: 93, end: 90});
 });
 
 test('should dispatch FETCH_END_FAILURE action when fetchEndRank fails', async t => {