From c9d81906c007b4b4aabf5ee12756638c38035b67 Mon Sep 17 00:00:00 2001 From: Chris Wilkinson Date: Tue, 11 Mar 2025 15:37:50 +0000 Subject: [PATCH] Replace deprecated setting Refs #2289 --- .../ChoosePersonaPage.test.ts | 2 +- test/WriteCommentFlow/CodeOfConduct.test.ts | 2 +- .../CompetingInterestsPage.test.ts | 4 +- .../WriteCommentFlow/EnterCommentPage.test.ts | 2 +- .../EnterEmailAddressPage.test.ts | 2 +- test/connect-slack-page/connect-slack.test.ts | 2 +- test/fc.ts | 4 +- test/flash-message.test.ts | 4 +- test/my-details-page/change-avatar.test.ts | 36 ++++++++-------- .../change-career-stage-visibility.test.ts | 41 +++++++++---------- .../change-career-stage.test.ts | 2 +- .../change-contact-email-address.test.ts | 4 +- .../change-languages-visibility.test.ts | 2 +- test/my-details-page/change-languages.test.ts | 2 +- .../change-location-visibility.test.ts | 2 +- test/my-details-page/change-location.test.ts | 2 +- ...hange-open-for-requests-visibility.test.ts | 2 +- .../change-open-for-requests.test.ts | 2 +- ...ange-research-interests-visibility.test.ts | 2 +- .../change-research-interests.test.ts | 2 +- test/prereview-coar-notify/fc.ts | 2 +- .../review-a-preprint.test.ts | 2 +- test/write-review/fc.ts | 22 +++++----- .../write-review/write-review-authors.test.ts | 2 +- .../write-review-change-author.test.ts | 2 +- .../write-review-competing-interests.test.ts | 4 +- .../write-review/write-review-conduct.test.ts | 2 +- .../write-review-data-presentation.test.ts | 2 +- .../write-review-findings-next-steps.test.ts | 2 +- .../write-review-introduction-matches.test.ts | 2 +- .../write-review-language-editing.test.ts | 2 +- .../write-review-methods-appropriate.test.ts | 2 +- test/write-review/write-review-novel.test.ts | 2 +- .../write-review/write-review-persona.test.ts | 2 +- .../write-review-ready-full-review.test.ts | 2 +- .../write-review-results-supported.test.ts | 2 +- .../write-review-review-type.test.ts | 2 +- test/write-review/write-review-review.test.ts | 2 +- .../write-review-should-read.test.ts | 2 +- .../write-review-use-of-ai.test.ts | 5 +-- 40 files changed, 91 insertions(+), 95 deletions(-) diff --git a/test/WriteCommentFlow/ChoosePersonaPage.test.ts b/test/WriteCommentFlow/ChoosePersonaPage.test.ts index 9ebe20d3a..8a02107fc 100644 --- a/test/WriteCommentFlow/ChoosePersonaPage.test.ts +++ b/test/WriteCommentFlow/ChoosePersonaPage.test.ts @@ -262,7 +262,7 @@ describe('ChoosePersonaSubmission', () => { fc.oneof( fc.record( { persona: fc.string().filter(persona => !['public', 'pseudonym'].includes(persona)) }, - { withDeletedKeys: true }, + { requiredKeys: [] }, ), fc.anything().filter(body => typeof body === 'object' && (body === null || !Object.hasOwn(body, 'persona'))), ), diff --git a/test/WriteCommentFlow/CodeOfConduct.test.ts b/test/WriteCommentFlow/CodeOfConduct.test.ts index 9606cf359..3de75f714 100644 --- a/test/WriteCommentFlow/CodeOfConduct.test.ts +++ b/test/WriteCommentFlow/CodeOfConduct.test.ts @@ -257,7 +257,7 @@ describe('CodeOfConductSubmission', () => { .chain(comment => fc.tuple(fc.constant(comment), fc.user({ orcid: fc.constant(comment.authorId) }))), fc.supportedLocale(), fc.oneof( - fc.record({ agree: fc.string().filter(string => string !== 'yes') }, { withDeletedKeys: true }), + fc.record({ agree: fc.string().filter(string => string !== 'yes') }, { requiredKeys: [] }), fc.anything().filter(body => typeof body === 'object' && (body === null || !Object.hasOwn(body, 'agree'))), ), ])("when there isn't agreement", (commentId, [comment, user], locale, body) => diff --git a/test/WriteCommentFlow/CompetingInterestsPage.test.ts b/test/WriteCommentFlow/CompetingInterestsPage.test.ts index 39c10bf0f..e0973122c 100644 --- a/test/WriteCommentFlow/CompetingInterestsPage.test.ts +++ b/test/WriteCommentFlow/CompetingInterestsPage.test.ts @@ -273,11 +273,11 @@ describe('CompetingInterestsSubmission', () => { competingInterests: fc.string().filter(competingInterests => !['no', 'yes'].includes(competingInterests)), competingInterestsDetails: fc.anything(), }, - { withDeletedKeys: true }, + { requiredKeys: [] }, ), fc.record( { competingInterests: fc.constant('yes'), competingInterestsDetails: fc.constant('') }, - { withDeletedKeys: true }, + { requiredKeys: [] }, ), fc .anything() diff --git a/test/WriteCommentFlow/EnterCommentPage.test.ts b/test/WriteCommentFlow/EnterCommentPage.test.ts index 77a36fe73..a5fff28a0 100644 --- a/test/WriteCommentFlow/EnterCommentPage.test.ts +++ b/test/WriteCommentFlow/EnterCommentPage.test.ts @@ -262,7 +262,7 @@ describe('EnterCommentSubmission', () => { .chain(comment => fc.tuple(fc.constant(comment), fc.user({ orcid: fc.constant(comment.authorId) }))), fc.supportedLocale(), fc.oneof( - fc.record({ comment: fc.constant('') }, { withDeletedKeys: true }), + fc.record({ comment: fc.constant('') }, { requiredKeys: [] }), fc.anything().filter(body => typeof body === 'object' && (body === null || !Object.hasOwn(body, 'comment'))), ), ])("when there isn't a comment", (commentId, [comment, user], locale, body) => diff --git a/test/WriteCommentFlow/EnterEmailAddressPage.test.ts b/test/WriteCommentFlow/EnterEmailAddressPage.test.ts index c468babcc..26d0a3310 100644 --- a/test/WriteCommentFlow/EnterEmailAddressPage.test.ts +++ b/test/WriteCommentFlow/EnterEmailAddressPage.test.ts @@ -442,7 +442,7 @@ describe('EnterEmailAddressSubmission', () => { .chain(comment => fc.tuple(fc.constant(comment), fc.user({ orcid: fc.constant(comment.authorId) }))), fc.supportedLocale(), fc.oneof( - fc.record({ emailAddress: fc.string().filter(string => !string.includes('@')) }, { withDeletedKeys: true }), + fc.record({ emailAddress: fc.string().filter(string => !string.includes('@')) }, { requiredKeys: [] }), fc .anything() .filter(body => typeof body === 'object' && (body === null || !Object.hasOwn(body, 'emailAddress'))), diff --git a/test/connect-slack-page/connect-slack.test.ts b/test/connect-slack-page/connect-slack.test.ts index a9567f754..87893c453 100644 --- a/test/connect-slack-page/connect-slack.test.ts +++ b/test/connect-slack-page/connect-slack.test.ts @@ -398,7 +398,7 @@ describe('connectSlackCode', () => { fc.string(), fc.string(), fc.connection({ - headers: fc.record({ Cookie: fc.lorem() }, { withDeletedKeys: true }), + headers: fc.record({ Cookie: fc.lorem() }, { requiredKeys: [] }), }), fc.html(), ])( diff --git a/test/fc.ts b/test/fc.ts index 912d94418..948b336cd 100644 --- a/test/fc.ts +++ b/test/fc.ts @@ -211,7 +211,7 @@ export const partialRecord = }, constraints?: TConstraints, ): fc.Arbitrary< - fc.RecordValue<{ [K in keyof T]: T[K] }, TConstraints extends undefined ? { withDeletedKeys: true } : TConstraints> + fc.RecordValue<{ [K in keyof T]: T[K] }, TConstraints extends undefined ? { requiredKeys: [] } : TConstraints> > => fc .constantFrom( @@ -222,7 +222,7 @@ export const partialRecord = fc.record( Object.fromEntries(Object.entries(recordModel).filter(([key]) => key !== omit)) as never, - (constraints ?? { withDeletedKeys: true }) as never, + (constraints ?? { requiredKeys: [] }) as never, ), ) diff --git a/test/flash-message.test.ts b/test/flash-message.test.ts index 111ce043c..757f246b0 100644 --- a/test/flash-message.test.ts +++ b/test/flash-message.test.ts @@ -19,7 +19,7 @@ describe('deleteFlashMessage', () => { expect(actual).toStrictEqual(E.right([{ type: 'clearCookie', name: 'flash-message', options: { httpOnly: true } }])) }) - test.prop([fc.connection({ headers: fc.record({ Cookie: fc.string() }, { withDeletedKeys: true }) })])( + test.prop([fc.connection({ headers: fc.record({ Cookie: fc.string() }, { requiredKeys: [] }) })])( "when there isn't a message", async connection => { const actual = await runMiddleware(_.deleteFlashMessage, connection)() @@ -54,7 +54,7 @@ describe('getFlashMessage', () => { fc.string().map(message => `flash-message="${encodeURIComponent(message)}"`), ), }, - { withDeletedKeys: true }, + { requiredKeys: [] }, ), }), ])("when the message can't be decoded", async connection => { diff --git a/test/my-details-page/change-avatar.test.ts b/test/my-details-page/change-avatar.test.ts index e017d2a00..a30220e5e 100644 --- a/test/my-details-page/change-avatar.test.ts +++ b/test/my-details-page/change-avatar.test.ts @@ -93,25 +93,25 @@ describe('changeAvatar', () => { }) }) - test.prop([ - fc.oneof(fc.anything(), fc.record({ avatar: fc.constant('ERROR') }, { withDeletedKeys: true })), - fc.user(), - ])('when the avatar is missing', async (body, user) => { - const actual = await _.changeAvatar({ body, method: 'POST', user })({ - saveAvatar: shouldNotBeCalled, - })() + test.prop([fc.oneof(fc.anything(), fc.record({ avatar: fc.constant('ERROR') }, { requiredKeys: [] })), fc.user()])( + 'when the avatar is missing', + async (body, user) => { + const actual = await _.changeAvatar({ body, method: 'POST', user })({ + saveAvatar: shouldNotBeCalled, + })() - expect(actual).toStrictEqual({ - _tag: 'PageResponse', - canonical: format(changeAvatarMatch.formatter, {}), - status: Status.BadRequest, - title: expect.anything(), - nav: expect.anything(), - main: expect.anything(), - skipToLabel: 'form', - js: ['error-summary.js', 'single-use-form.js'], - }) - }) + expect(actual).toStrictEqual({ + _tag: 'PageResponse', + canonical: format(changeAvatarMatch.formatter, {}), + status: Status.BadRequest, + title: expect.anything(), + nav: expect.anything(), + main: expect.anything(), + skipToLabel: 'form', + js: ['error-summary.js', 'single-use-form.js'], + }) + }, + ) test.prop([fc.anything(), fc.string().filter(method => method !== 'POST'), fc.user()])( 'when the form needs to be submitted', diff --git a/test/my-details-page/change-career-stage-visibility.test.ts b/test/my-details-page/change-career-stage-visibility.test.ts index 9ae1127c5..cdea6f47b 100644 --- a/test/my-details-page/change-career-stage-visibility.test.ts +++ b/test/my-details-page/change-career-stage-visibility.test.ts @@ -78,29 +78,28 @@ describe('changeCareerStageVisibility', () => { }, ) - test.prop([ - fc.record({ careerStageVisibility: fc.string() }, { withDeletedKeys: true }), - fc.user(), - fc.careerStage(), - ])('when the form has been submitted without setting visibility', async (body, user, careerStage) => { - const saveCareerStage = jest.fn<_.Env['saveCareerStage']>(_ => TE.right(undefined)) + test.prop([fc.record({ careerStageVisibility: fc.string() }, { requiredKeys: [] }), fc.user(), fc.careerStage()])( + 'when the form has been submitted without setting visibility', + async (body, user, careerStage) => { + const saveCareerStage = jest.fn<_.Env['saveCareerStage']>(_ => TE.right(undefined)) - const actual = await _.changeCareerStageVisibility({ body, method: 'POST', user })({ - deleteCareerStage: shouldNotBeCalled, - getCareerStage: () => TE.of(careerStage), - saveCareerStage, - })() + const actual = await _.changeCareerStageVisibility({ body, method: 'POST', user })({ + deleteCareerStage: shouldNotBeCalled, + getCareerStage: () => TE.of(careerStage), + saveCareerStage, + })() - expect(actual).toStrictEqual({ - _tag: 'RedirectResponse', - status: Status.SeeOther, - location: format(myDetailsMatch.formatter, {}), - }) - expect(saveCareerStage).toHaveBeenCalledWith(user.orcid, { - value: careerStage.value, - visibility: 'restricted', - }) - }) + expect(actual).toStrictEqual({ + _tag: 'RedirectResponse', + status: Status.SeeOther, + location: format(myDetailsMatch.formatter, {}), + }) + expect(saveCareerStage).toHaveBeenCalledWith(user.orcid, { + value: careerStage.value, + visibility: 'restricted', + }) + }, + ) test.prop([fc.anything(), fc.string(), fc.user()])("there isn't a career stage", async (body, method, user) => { const actual = await _.changeCareerStageVisibility({ body, method, user })({ diff --git a/test/my-details-page/change-career-stage.test.ts b/test/my-details-page/change-career-stage.test.ts index 55875c389..ca426e7c7 100644 --- a/test/my-details-page/change-career-stage.test.ts +++ b/test/my-details-page/change-career-stage.test.ts @@ -119,7 +119,7 @@ describe('changeCareerStage', () => { expect(deleteCareerStage).toHaveBeenCalledWith(user.orcid) }) - test.prop([fc.record({ careerStage: fc.lorem() }, { withDeletedKeys: true }), fc.user()])( + test.prop([fc.record({ careerStage: fc.lorem() }, { requiredKeys: [] }), fc.user()])( 'when the form has been submitted without setting career stage', async (body, user) => { const actual = await _.changeCareerStage({ body, method: 'POST', user })({ diff --git a/test/my-details-page/change-contact-email-address.test.ts b/test/my-details-page/change-contact-email-address.test.ts index 1d1f6cbfa..adad843a3 100644 --- a/test/my-details-page/change-contact-email-address.test.ts +++ b/test/my-details-page/change-contact-email-address.test.ts @@ -170,7 +170,7 @@ describe('changeContactEmailAddress', () => { describe('when no email address is set', () => { test.prop([ - fc.record({ emailAddress: fc.constant('') }, { withDeletedKeys: true }), + fc.record({ emailAddress: fc.constant('') }, { requiredKeys: [] }), fc.user(), fc.contactEmailAddress(), ])('when there was an email address before', async (body, user, existingEmailAddress) => { @@ -193,7 +193,7 @@ describe('changeContactEmailAddress', () => { }) }) - test.prop([fc.record({ emailAddress: fc.constant('') }, { withDeletedKeys: true }), fc.user()])( + test.prop([fc.record({ emailAddress: fc.constant('') }, { requiredKeys: [] }), fc.user()])( "when there wasn't an email address before", async (body, user) => { const actual = await _.changeContactEmailAddress({ body, method: 'POST', user })({ diff --git a/test/my-details-page/change-languages-visibility.test.ts b/test/my-details-page/change-languages-visibility.test.ts index 2aa3d0292..14b128aa7 100644 --- a/test/my-details-page/change-languages-visibility.test.ts +++ b/test/my-details-page/change-languages-visibility.test.ts @@ -78,7 +78,7 @@ describe('changeLanguagesVisibility', () => { }, ) - test.prop([fc.record({ languagesVisibility: fc.string() }, { withDeletedKeys: true }), fc.user(), fc.languages()])( + test.prop([fc.record({ languagesVisibility: fc.string() }, { requiredKeys: [] }), fc.user(), fc.languages()])( 'when the form has been submitted without setting visibility', async (body, user, languages) => { const saveLanguages = jest.fn<_.Env['saveLanguages']>(_ => TE.right(undefined)) diff --git a/test/my-details-page/change-languages.test.ts b/test/my-details-page/change-languages.test.ts index d59307ee9..8be06452b 100644 --- a/test/my-details-page/change-languages.test.ts +++ b/test/my-details-page/change-languages.test.ts @@ -96,7 +96,7 @@ describe('changeLanguages', () => { }) }) - test.prop([fc.record({ languages: fc.constant('') }, { withDeletedKeys: true }), fc.user()])( + test.prop([fc.record({ languages: fc.constant('') }, { requiredKeys: [] }), fc.user()])( 'when the form has been submitted without setting languages', async (body, user) => { const deleteLanguages = jest.fn<_.Env['deleteLanguages']>(_ => TE.right(undefined)) diff --git a/test/my-details-page/change-location-visibility.test.ts b/test/my-details-page/change-location-visibility.test.ts index de8635ba3..715b3a4f7 100644 --- a/test/my-details-page/change-location-visibility.test.ts +++ b/test/my-details-page/change-location-visibility.test.ts @@ -78,7 +78,7 @@ describe('changeLocationVisibility', () => { }, ) - test.prop([fc.record({ locationVisibility: fc.string() }, { withDeletedKeys: true }), fc.user(), fc.location()])( + test.prop([fc.record({ locationVisibility: fc.string() }, { requiredKeys: [] }), fc.user(), fc.location()])( 'when the form has been submitted without setting visibility', async (body, user, location) => { const saveLocation = jest.fn<_.Env['saveLocation']>(_ => TE.right(undefined)) diff --git a/test/my-details-page/change-location.test.ts b/test/my-details-page/change-location.test.ts index c260df7fc..285882a64 100644 --- a/test/my-details-page/change-location.test.ts +++ b/test/my-details-page/change-location.test.ts @@ -96,7 +96,7 @@ describe('changeLocation', () => { }) }) - test.prop([fc.record({ location: fc.constant('') }, { withDeletedKeys: true }), fc.user()])( + test.prop([fc.record({ location: fc.constant('') }, { requiredKeys: [] }), fc.user()])( 'when the form has been submitted without setting a location', async (body, user) => { const deleteLocation = jest.fn<_.Env['deleteLocation']>(_ => TE.right(undefined)) diff --git a/test/my-details-page/change-open-for-requests-visibility.test.ts b/test/my-details-page/change-open-for-requests-visibility.test.ts index 6deab3124..8580ca2f7 100644 --- a/test/my-details-page/change-open-for-requests-visibility.test.ts +++ b/test/my-details-page/change-open-for-requests-visibility.test.ts @@ -76,7 +76,7 @@ describe('changeOpenForRequestsVisibility', () => { }) test.prop([ - fc.record({ openForRequestsVisibility: fc.string() }, { withDeletedKeys: true }), + fc.record({ openForRequestsVisibility: fc.string() }, { requiredKeys: [] }), fc.user(), fc.isOpenForRequestsVisibility(), ])('when the form has been submitted without setting visibility', async (body, user, visibility) => { diff --git a/test/my-details-page/change-open-for-requests.test.ts b/test/my-details-page/change-open-for-requests.test.ts index b0cc07776..9009f93d2 100644 --- a/test/my-details-page/change-open-for-requests.test.ts +++ b/test/my-details-page/change-open-for-requests.test.ts @@ -107,7 +107,7 @@ describe('changeOpenForRequests', () => { }, ) - test.prop([fc.record({ openForRequests: fc.lorem() }, { withDeletedKeys: true }), fc.user()])( + test.prop([fc.record({ openForRequests: fc.lorem() }, { requiredKeys: [] }), fc.user()])( 'when the form has been submitted without setting open for requests', async (body, user) => { const actual = await _.changeOpenForRequests({ body, method: 'POST', user })({ diff --git a/test/my-details-page/change-research-interests-visibility.test.ts b/test/my-details-page/change-research-interests-visibility.test.ts index 6688756ce..647075909 100644 --- a/test/my-details-page/change-research-interests-visibility.test.ts +++ b/test/my-details-page/change-research-interests-visibility.test.ts @@ -80,7 +80,7 @@ describe('changeResearchInterestsVisibility', () => { }) test.prop([ - fc.record({ researchInterestsVisibility: fc.string() }, { withDeletedKeys: true }), + fc.record({ researchInterestsVisibility: fc.string() }, { requiredKeys: [] }), fc.user(), fc.researchInterests(), ])('when the form has been submitted without setting visibility', async (body, user, researchInterests) => { diff --git a/test/my-details-page/change-research-interests.test.ts b/test/my-details-page/change-research-interests.test.ts index a9116369e..4fe65af83 100644 --- a/test/my-details-page/change-research-interests.test.ts +++ b/test/my-details-page/change-research-interests.test.ts @@ -105,7 +105,7 @@ describe('changeResearchInterests', () => { }, ) - test.prop([fc.record({ researchInterests: fc.constant('') }, { withDeletedKeys: true }), fc.user()])( + test.prop([fc.record({ researchInterests: fc.constant('') }, { requiredKeys: [] }), fc.user()])( 'when the form has been submitted without setting research interests', async (body, user) => { const deleteResearchInterests = jest.fn<_.Env['deleteResearchInterests']>(_ => TE.right(undefined)) diff --git a/test/prereview-coar-notify/fc.ts b/test/prereview-coar-notify/fc.ts index 1207b2c98..88f359939 100644 --- a/test/prereview-coar-notify/fc.ts +++ b/test/prereview-coar-notify/fc.ts @@ -32,7 +32,7 @@ export const coarReviewActionOfferPayload = (): fc.Arbitrary => fc.record({ - preprint: fc.record({ doi: fc.doi() }, { withDeletedKeys: true }), + preprint: fc.record({ doi: fc.doi() }, { requiredKeys: [] }), doi: fc.doi(), url: fc.url(), author: fc.record({ diff --git a/test/review-a-preprint-page/review-a-preprint.test.ts b/test/review-a-preprint-page/review-a-preprint.test.ts index 02b6ae711..ee30538fc 100644 --- a/test/review-a-preprint-page/review-a-preprint.test.ts +++ b/test/review-a-preprint-page/review-a-preprint.test.ts @@ -130,7 +130,7 @@ describe('reviewAPreprint', () => { }) }) - test.prop([fc.record({ preprint: fc.string() }, { withDeletedKeys: true })])('with a non-DOI', async body => { + test.prop([fc.record({ preprint: fc.string() }, { requiredKeys: [] })])('with a non-DOI', async body => { const actual = await _.reviewAPreprint({ body, method: 'POST' })({ doesPreprintExist: shouldNotBeCalled })() expect(actual).toStrictEqual({ diff --git a/test/write-review/fc.ts b/test/write-review/fc.ts index ee520d214..f0c89d4ba 100644 --- a/test/write-review/fc.ts +++ b/test/write-review/fc.ts @@ -20,7 +20,7 @@ export const introductionMatchesDetails = (): fc.Arbitrary['intro partly: fc.nonEmptyString(), no: fc.nonEmptyString(), }, - { withDeletedKeys: true }, + { requiredKeys: [] }, ), fc.constant({}), ) @@ -45,7 +45,7 @@ export const methodsAppropriateDetails = (): fc.Arbitrary['method 'mostly-appropriate': fc.nonEmptyString(), 'highly-appropriate': fc.nonEmptyString(), }, - { withDeletedKeys: true }, + { requiredKeys: [] }, ), fc.constant({}), ) @@ -63,7 +63,7 @@ export const resultsSupportedDetails = (): fc.Arbitrary['resultsS 'well-supported': fc.nonEmptyString(), 'strongly-supported': fc.nonEmptyString(), }, - { withDeletedKeys: true }, + { requiredKeys: [] }, ), fc.constant({}), ) @@ -88,7 +88,7 @@ export const dataPresentationDetails = (): fc.Arbitrary['dataPres 'mostly-appropriate-clear': fc.nonEmptyString(), 'highly-appropriate-clear': fc.nonEmptyString(), }, - { withDeletedKeys: true }, + { requiredKeys: [] }, ), fc.constant({}), ) @@ -106,7 +106,7 @@ export const findingsNextStepsDetails = (): fc.Arbitrary['finding 'clearly-insightfully': fc.nonEmptyString(), exceptionally: fc.nonEmptyString(), }, - { withDeletedKeys: true }, + { requiredKeys: [] }, ), fc.constant({}), ) @@ -124,7 +124,7 @@ export const novelDetails = (): fc.Arbitrary['novelDetails']> => substantial: fc.nonEmptyString(), highly: fc.nonEmptyString(), }, - { withDeletedKeys: true }, + { requiredKeys: [] }, ), fc.constant({}), ) @@ -138,7 +138,7 @@ export const languageEditingDetails = (): fc.Arbitrary['languageE yes: fc.nonEmptyString(), no: fc.nonEmptyString(), }, - { withDeletedKeys: true }, + { requiredKeys: [] }, ), fc.constant({}), ) @@ -153,7 +153,7 @@ export const shouldReadDetails = (): fc.Arbitrary['shouldReadDeta 'yes-but': fc.nonEmptyString(), no: fc.nonEmptyString(), }, - { withDeletedKeys: true }, + { requiredKeys: [] }, ), fc.constant({}), ) @@ -169,7 +169,7 @@ export const readyFullReviewDetails = (): fc.Arbitrary['readyFull 'yes-changes': fc.nonEmptyString(), no: fc.nonEmptyString(), }, - { withDeletedKeys: true }, + { requiredKeys: [] }, ), fc.constant({}), ) @@ -232,7 +232,7 @@ export const incompleteQuestionsForm = (): fc.Arbitrary
{ fc.connection({ body: fc.record( { moreAuthors: fc.string(), moreAuthorsApproved: fc.moreAuthorsApproved() }, - { withDeletedKeys: true }, + { requiredKeys: [] }, ), method: fc.constant('POST'), }), diff --git a/test/write-review/write-review-change-author.test.ts b/test/write-review/write-review-change-author.test.ts index 8620953c0..2347783da 100644 --- a/test/write-review/write-review-change-author.test.ts +++ b/test/write-review/write-review-change-author.test.ts @@ -51,7 +51,7 @@ describe('writeReviewChangeAuthor', () => { name: fc.anything().filter(value => typeof value !== 'string' || value === ''), emailAddress: fc.anything().filter(value => typeof value !== 'string' || !value.includes('@')), }, - { withDeletedKeys: true }, + { requiredKeys: [] }, ), ), fc diff --git a/test/write-review/write-review-competing-interests.test.ts b/test/write-review/write-review-competing-interests.test.ts index a3cdf02a8..5d7f2e05d 100644 --- a/test/write-review/write-review-competing-interests.test.ts +++ b/test/write-review/write-review-competing-interests.test.ts @@ -148,10 +148,10 @@ describe('writeReviewCompetingInterests', () => { fc.indeterminatePreprintId(), fc.preprintTitle(), fc.oneof( - fc.record({ competingInterests: fc.string() }, { withDeletedKeys: true }), + fc.record({ competingInterests: fc.string() }, { requiredKeys: [] }), fc.record( { competingInterests: fc.constant('yes'), competingInterestsDetails: fc.constant('') }, - { withDeletedKeys: true }, + { requiredKeys: [] }, ), ), fc.user(), diff --git a/test/write-review/write-review-conduct.test.ts b/test/write-review/write-review-conduct.test.ts index ddd26ebf5..35520ac8f 100644 --- a/test/write-review/write-review-conduct.test.ts +++ b/test/write-review/write-review-conduct.test.ts @@ -208,7 +208,7 @@ describe('writeReviewConduct', () => { fc.indeterminatePreprintId(), fc.preprintTitle(), fc.connection({ - body: fc.record({ conduct: fc.string() }, { withDeletedKeys: true }), + body: fc.record({ conduct: fc.string() }, { requiredKeys: [] }), method: fc.constant('POST'), }), fc.user(), diff --git a/test/write-review/write-review-data-presentation.test.ts b/test/write-review/write-review-data-presentation.test.ts index 0262527e1..b43ea58e6 100644 --- a/test/write-review/write-review-data-presentation.test.ts +++ b/test/write-review/write-review-data-presentation.test.ts @@ -227,7 +227,7 @@ describe('writeReviewDataPresentation', () => { fc.indeterminatePreprintId(), fc.preprintTitle(), fc.connection({ - body: fc.record({ dataPresentation: fc.lorem() }, { withDeletedKeys: true }), + body: fc.record({ dataPresentation: fc.lorem() }, { requiredKeys: [] }), method: fc.constant('POST'), }), fc.user(), diff --git a/test/write-review/write-review-findings-next-steps.test.ts b/test/write-review/write-review-findings-next-steps.test.ts index 6a98fcfe1..0386e2e2b 100644 --- a/test/write-review/write-review-findings-next-steps.test.ts +++ b/test/write-review/write-review-findings-next-steps.test.ts @@ -229,7 +229,7 @@ describe('writeReviewFindingsNextSteps', () => { fc.indeterminatePreprintId(), fc.preprintTitle(), fc.connection({ - body: fc.record({ findingsNextSteps: fc.lorem() }, { withDeletedKeys: true }), + body: fc.record({ findingsNextSteps: fc.lorem() }, { requiredKeys: [] }), method: fc.constant('POST'), }), fc.user(), diff --git a/test/write-review/write-review-introduction-matches.test.ts b/test/write-review/write-review-introduction-matches.test.ts index e61815825..1c183b23e 100644 --- a/test/write-review/write-review-introduction-matches.test.ts +++ b/test/write-review/write-review-introduction-matches.test.ts @@ -237,7 +237,7 @@ describe('writeReviewIntroductionMatches', () => { fc.indeterminatePreprintId(), fc.preprintTitle(), fc.connection({ - body: fc.record({ introductionMatches: fc.lorem() }, { withDeletedKeys: true }), + body: fc.record({ introductionMatches: fc.lorem() }, { requiredKeys: [] }), method: fc.constant('POST'), }), fc.user(), diff --git a/test/write-review/write-review-language-editing.test.ts b/test/write-review/write-review-language-editing.test.ts index 0359f47d2..14bb5b109 100644 --- a/test/write-review/write-review-language-editing.test.ts +++ b/test/write-review/write-review-language-editing.test.ts @@ -219,7 +219,7 @@ describe('writeReviewLanguageEditing', () => { fc.indeterminatePreprintId(), fc.preprintTitle(), fc.connection({ - body: fc.record({ languageEditing: fc.lorem() }, { withDeletedKeys: true }), + body: fc.record({ languageEditing: fc.lorem() }, { requiredKeys: [] }), method: fc.constant('POST'), }), fc.user(), diff --git a/test/write-review/write-review-methods-appropriate.test.ts b/test/write-review/write-review-methods-appropriate.test.ts index 9d3ec156b..e18eaa520 100644 --- a/test/write-review/write-review-methods-appropriate.test.ts +++ b/test/write-review/write-review-methods-appropriate.test.ts @@ -229,7 +229,7 @@ describe('writeReviewMethodsAppropriate', () => { fc.indeterminatePreprintId(), fc.preprintTitle(), fc.connection({ - body: fc.record({ methodsAppropriate: fc.lorem() }, { withDeletedKeys: true }), + body: fc.record({ methodsAppropriate: fc.lorem() }, { requiredKeys: [] }), method: fc.constant('POST'), }), fc.user(), diff --git a/test/write-review/write-review-novel.test.ts b/test/write-review/write-review-novel.test.ts index 9db598ebf..0f83af771 100644 --- a/test/write-review/write-review-novel.test.ts +++ b/test/write-review/write-review-novel.test.ts @@ -219,7 +219,7 @@ describe('writeReviewNovel', () => { fc.indeterminatePreprintId(), fc.preprintTitle(), fc.connection({ - body: fc.record({ novel: fc.lorem() }, { withDeletedKeys: true }), + body: fc.record({ novel: fc.lorem() }, { requiredKeys: [] }), method: fc.constant('POST'), }), fc.user(), diff --git a/test/write-review/write-review-persona.test.ts b/test/write-review/write-review-persona.test.ts index 76d5b3172..f6d77fd92 100644 --- a/test/write-review/write-review-persona.test.ts +++ b/test/write-review/write-review-persona.test.ts @@ -216,7 +216,7 @@ describe('writeReviewPersona', () => { fc.indeterminatePreprintId(), fc.preprintTitle(), fc.connection({ - body: fc.record({ persona: fc.string() }, { withDeletedKeys: true }), + body: fc.record({ persona: fc.string() }, { requiredKeys: [] }), method: fc.constant('POST'), }), fc.user(), diff --git a/test/write-review/write-review-ready-full-review.test.ts b/test/write-review/write-review-ready-full-review.test.ts index 3b9d88979..0746ba800 100644 --- a/test/write-review/write-review-ready-full-review.test.ts +++ b/test/write-review/write-review-ready-full-review.test.ts @@ -221,7 +221,7 @@ describe('writeReviewReadyFullReview', () => { fc.indeterminatePreprintId(), fc.preprintTitle(), fc.connection({ - body: fc.record({ readyFullReview: fc.lorem() }, { withDeletedKeys: true }), + body: fc.record({ readyFullReview: fc.lorem() }, { requiredKeys: [] }), method: fc.constant('POST'), }), fc.user(), diff --git a/test/write-review/write-review-results-supported.test.ts b/test/write-review/write-review-results-supported.test.ts index 3da651933..8fbbdcb4f 100644 --- a/test/write-review/write-review-results-supported.test.ts +++ b/test/write-review/write-review-results-supported.test.ts @@ -225,7 +225,7 @@ describe('writeReviewResultsSupported', () => { fc.indeterminatePreprintId(), fc.preprintTitle(), fc.connection({ - body: fc.record({ resultsSupported: fc.lorem() }, { withDeletedKeys: true }), + body: fc.record({ resultsSupported: fc.lorem() }, { requiredKeys: [] }), method: fc.constant('POST'), }), fc.user(), diff --git a/test/write-review/write-review-review-type.test.ts b/test/write-review/write-review-review-type.test.ts index 6d52e8f61..7b002f13f 100644 --- a/test/write-review/write-review-review-type.test.ts +++ b/test/write-review/write-review-review-type.test.ts @@ -177,7 +177,7 @@ describe('writeReviewReviewType', () => { test.prop([ fc.indeterminatePreprintId(), fc.preprint(), - fc.record({ reviewType: fc.lorem() }, { withDeletedKeys: true }), + fc.record({ reviewType: fc.lorem() }, { requiredKeys: [] }), fc.user(), fc.form(), ])( diff --git a/test/write-review/write-review-review.test.ts b/test/write-review/write-review-review.test.ts index 6161b7f80..2c7ba8248 100644 --- a/test/write-review/write-review-review.test.ts +++ b/test/write-review/write-review-review.test.ts @@ -163,7 +163,7 @@ describe('writeReviewReview', () => { test.prop([ fc.indeterminatePreprintId(), fc.preprintTitle(), - fc.record({ review: fc.constant('') }, { withDeletedKeys: true }), + fc.record({ review: fc.constant('') }, { requiredKeys: [] }), fc.user(), fc.freeformForm(), ])('without a review', async (preprintId, preprintTitle, body, user, newReview) => { diff --git a/test/write-review/write-review-should-read.test.ts b/test/write-review/write-review-should-read.test.ts index 57e46f1c9..8848256b9 100644 --- a/test/write-review/write-review-should-read.test.ts +++ b/test/write-review/write-review-should-read.test.ts @@ -221,7 +221,7 @@ describe('writeReviewShouldRead', () => { fc.indeterminatePreprintId(), fc.preprintTitle(), fc.connection({ - body: fc.record({ shouldRead: fc.lorem() }, { withDeletedKeys: true }), + body: fc.record({ shouldRead: fc.lorem() }, { requiredKeys: [] }), method: fc.constant('POST'), }), fc.user(), diff --git a/test/write-review/write-review-use-of-ai.test.ts b/test/write-review/write-review-use-of-ai.test.ts index 529d06620..bdb4339a4 100644 --- a/test/write-review/write-review-use-of-ai.test.ts +++ b/test/write-review/write-review-use-of-ai.test.ts @@ -191,10 +191,7 @@ describe('writeReviewUseOfAiSubmission', () => { fc.preprintTitle(), fc.user(), fc.oneof( - fc.record( - { generativeAiIdeas: fc.string().filter(s => !['yes', 'no'].includes(s)) }, - { withDeletedKeys: true }, - ), + fc.record({ generativeAiIdeas: fc.string().filter(s => !['yes', 'no'].includes(s)) }, { requiredKeys: [] }), fc.anything(), ), fc.supportedLocale(),