2298: move redirect to confirm button (#2305)

* 2298: moved redirect to survey on confirmation

* refactored tests

* removed isPublic from features as it cascades from default

* copy config.features and restore them after each test

Author: erezmus

config/unit-test.js

@@ -62,4 +62,7 @@ module.exports = {
       },
     },
   },
+  features: {
+    demographicSurvey: false,
+  },
 }

packages/component-submission/client/pages/SubmissionWizard.js

@@ -10,6 +10,7 @@ import styled from 'styled-components'
 import { th } from '@pubsweet/ui-toolkit'
 import { Formik, Form } from 'formik'
 import * as yup from 'yup'
+import config from 'config'
 import {
   ErrorPage,
   TrackedRoute,
@@ -107,7 +108,13 @@ export const SubmissionWizard = ({
           variables: { data: parseFormToOutputData(formValues) },
         }),
       )
-      .then(() => history.push(`/thankyou/${match.params.id}`))
+      .then(() =>
+        history.push(
+          config.features && config.features.demographicSurvey
+            ? `/survey/${match.params.id}`
+            : `/thankyou/${match.params.id}`,
+        ),
+      )
 
   const navigateToStep = step => {
     setCurrentStep(step)

packages/component-submission/client/pages/SubmissionWizard.test.js

@@ -1,8 +1,10 @@
+/* eslint-disable import/first */
 import { render, cleanup, fireEvent, configure } from '@testing-library/react'
 import theme from '@elifesciences/elife-theme'
 import React from 'react'
 import 'jest-dom/extend-expect'
 import flushPromises from 'flush-promises'
+import config from 'config'
 import { ThemeProvider } from 'styled-components'
 import { MemoryRouter } from 'react-router-dom'
 import { MockedProvider } from 'react-apollo/test-utils'
@@ -31,16 +33,17 @@ const setupProvider = (historyLocation = []) => ({ children }) => (
   </ThemeProvider>
 )
 
-const makeProps = (path, pushHistory = jest.fn()) => ({
+const makeProps = (path, pushHistory = jest.fn(), props) => ({
   data: { manuscript: { meta: {} } },
   match: { path: '/submit/id', url: '', params: { id: 'id' } },
   history: { location: { pathname: path }, push: pushHistory },
   updateManuscript: jest.fn(),
   submitManuscript: jest.fn(),
+  ...props,
 })
 
-const renderWithPath = (path, pushHistory) =>
-  render(<SubmissionWizard {...makeProps(path, pushHistory)} />, {
+const renderWithPath = (path, pushHistory, props = {}) =>
+  render(<SubmissionWizard {...makeProps(path, pushHistory, props)} />, {
     wrapper: setupProvider([path]),
   })
 
@@ -90,6 +93,55 @@ describe('SubmissionWizard', async () => {
     ).toBeTruthy()
   })
 
+  describe('submit', () => {
+    describe('survey feature flag', () => {
+      const path = '/submit/id/disclosure'
+      const submitManuscript = jest.fn()
+      const pushHistory = jest.fn()
+      const originalFeatures = { ...config.features }
+
+      afterEach(() => {
+        config.features = originalFeatures
+        submitManuscript.mockReset()
+        pushHistory.mockReset()
+      })
+
+      it('should redirect to thank you if survey flag is off', async () => {
+        config.features.demographicSurvey = false
+        const { getByTestId, getByText } = renderWithPath(path, pushHistory, {
+          submitManuscript,
+        })
+
+        fireEvent.click(getByTestId('submit'))
+        await flushPromises()
+
+        fireEvent.click(getByText('Confirm'))
+        await flushPromises()
+
+        expect(submitManuscript).toHaveBeenCalledTimes(1)
+        expect(pushHistory).toHaveBeenCalledTimes(1)
+        expect(pushHistory).toHaveBeenCalledWith('/thankyou/id')
+      })
+
+      it('should redirect to survey page if survey flag is on', async () => {
+        config.features.demographicSurvey = true
+        const { getByTestId, getByText } = renderWithPath(path, pushHistory, {
+          submitManuscript,
+        })
+
+        fireEvent.click(getByTestId('submit'))
+        await flushPromises()
+
+        fireEvent.click(getByText('Confirm'))
+        await flushPromises()
+
+        expect(submitManuscript).toHaveBeenCalledTimes(1)
+        expect(pushHistory).toHaveBeenCalledTimes(1)
+        expect(pushHistory).toHaveBeenCalledWith('/survey/id')
+      })
+    })
+  })
+
   describe('step navigation', () => {
     // eslint-disable-next-line no-console
     const consoleError = console.error

packages/component-submission/client/pages/ThankYouPage.js

@@ -48,15 +48,7 @@ export class ThankYouPageComponent extends React.Component {
           submission.
           <BookmarkLink href="/">elifesciences.org/submissions</BookmarkLink>
         </Paragraph.Small>
-        <ButtonLink
-          data-test-id="finish"
-          primary
-          to={
-            config.features && config.features.demographicSurvey
-              ? `/survey/${data.manuscript.id}`
-              : '/'
-          }
-        >
+        <ButtonLink data-test-id="finish" primary to="/">
           Finish
         </ButtonLink>
       </CenteredContent>