Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix a number of issues in ExportWins/Review #6611

Merged
merged 1 commit into from
Mar 15, 2024
Merged

Fix a number of issues in ExportWins/Review #6611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/client/modules/ExportWins/Review/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ const Step2Agree = () => (
)

const Step2Disagree = () => (
<Step name="2-disagree">
<Step name="2-disagree" submitButtonLabel="Confirm and send">
<FieldTextarea
name="comments"
label="Comments"
Expand Down Expand Up @@ -189,6 +189,7 @@ const Step4 = () => (
<FieldCheckboxes
name="checkboxes1"
legend="Please tick all that apply to this win:"
required="Select at least 1 of the 3 options below."
options={[
{
label:
Expand All @@ -208,9 +209,10 @@ const Step4 = () => (
<FieldCheckboxes
name="checkboxes2"
legend="Tick any that apply to this win:"
required="Select at least 1 of the 5 options below."
options={[
{
label: 'It enabled vou to expand into a new market',
label: 'It enabled you to expand into a new market',
value: 'has_enabled_expansion_into_new_market',
},
{
Expand Down Expand Up @@ -249,7 +251,7 @@ const Step5 = () => (
)

const Step6 = () => (
<Step name="6">
<Step name="6" submitButtonLabel="Confirm and send">
<H2>Marketing</H2>
<FieldRadios
name="case_study_willing"
Expand All @@ -272,8 +274,9 @@ const Step6 = () => (
<FieldInput
name="other_marketing_source"
type="text"
label="Label comes later"
required="Please specify"
label="Other way you heard about DBT"
required="Enter a description of the other way you heard about DBT"
hint="Please describe the other way you heard about DBT"
/>
),
}
Expand All @@ -299,7 +302,6 @@ const Review = ({ token }) => (
id={FORM_ID}
analyticsFormName={FORM_ID}
submissionTaskName="TASK_PATCH_EXPORT_WIN_REVIEW"
// showStepInUrl={true}
redirectMode="soft"
redirectTo={() => '/exportwins/review-win/thankyou'}
transformPayload={transformPayload(token)}
Expand Down
46 changes: 36 additions & 10 deletions test/component/cypress/specs/ExportWins/Review.cy.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
assertFieldRadiosStrict,
assertFieldCheckboxes,
assertFieldTextarea,
assertErrorSummary,
} from '../../../../functional/cypress/support/assertions'
import Review from '../../../../../src/client/modules/ExportWins/Review'
import { createTestProvider } from '../provider'
Expand Down Expand Up @@ -148,7 +149,10 @@ describe('ExportWins/Review', () => {

const MARKETING_SOURCE = [
{ id: 'marketing-source-a', name: 'marketing-source-A' },
{ id: 'marketing-source-b', name: 'marketing-source-B' },
{
id: 'marketing-source-b',
name: 'marketing-source-B (please specify)',
},
{ id: 'marketing-source-c', name: 'marketing-source-C' },
]

Expand Down Expand Up @@ -286,15 +290,11 @@ describe('ExportWins/Review', () => {
],
})

cy.contains(
'Our support was a prerequisite to generate this value'
).click()

assertFieldCheckboxes({
element: '#field-checkboxes2',
legend: 'Tick any that apply to this win:',
options: [
{ label: 'It enabled vou to expand into a new market' },
{ label: 'It enabled you to expand into a new market' },
{
label: 'It enabled you to maintain or expand in an existing market',
},
Expand All @@ -313,12 +313,22 @@ describe('ExportWins/Review', () => {
],
})

cy.get('@continue').click()

// Assert errors
assertErrorSummary([
'Select at least 1 of the 3 options below.',
'Select at least 1 of the 5 options below.',
])

cy.get('@continue').click()

cy.contains(
'It enabled you to maintain or expand in an existing market'
'Our support was a prerequisite to generate this value'
).click()

cy.contains(
"If you hadn't achieved this win, your company might have stopped exporting"
'It enabled you to maintain or expand in an existing market'
).click()

cy.get('@continue').click()
Expand Down Expand Up @@ -354,7 +364,23 @@ describe('ExportWins/Review', () => {
selectIndex: 1,
})

cy.contains('button', 'Submit').click()
// There should appear an input field
cy.get('input#other_marketing_source')
cy.get('label[for="other_marketing_source"]').should(
'have.text',
'Other way you heard about DBT'
)

// The field should be required
cy.contains('button', 'Confirm and send').click()
assertErrorSummary([
'Enter a description of the other way you heard about DBT',
])

// Fill out the field
cy.get('input#other_marketing_source').type('Blah blah blah')

cy.contains('button', 'Confirm and send').click()

assertReviewed()

Expand Down Expand Up @@ -430,7 +456,7 @@ describe('ExportWins/Review', () => {

cy.get('#comments').type('Lorem ipsum dolor sit amet')

cy.contains('button', 'Submit').click()
cy.contains('button', 'Confirm and send').click()

assertReviewed()

Expand Down
Loading