diff --git a/.changeset/neat-ghosts-sing.md b/.changeset/neat-ghosts-sing.md new file mode 100644 index 0000000000..6d2f5cfebb --- /dev/null +++ b/.changeset/neat-ghosts-sing.md @@ -0,0 +1,7 @@ +--- +"@khanacademy/perseus-dev-ui": patch +"@khanacademy/perseus": patch +"@khanacademy/perseus-editor": patch +--- + +Internal: Move tests, test data, and Storybook stories for the Interactive Graph widget to the directory specific to that widget. diff --git a/dev/gallery.tsx b/dev/gallery.tsx index 401a30c456..6d7f68b5eb 100644 --- a/dev/gallery.tsx +++ b/dev/gallery.tsx @@ -13,8 +13,8 @@ import {useEffect, useMemo, useState} from "react"; import {Renderer} from "../packages/perseus/src"; import {mockStrings} from "../packages/perseus/src/strings"; import {MafsGraphTypeFlags} from "../packages/perseus/src/types"; -import * as interactiveGraph from "../packages/perseus/src/widgets/__testdata__/interactive-graph.testdata"; import * as grapher from "../packages/perseus/src/widgets/grapher/grapher.testdata"; +import * as interactiveGraph from "../packages/perseus/src/widgets/interactive-graphs/interactive-graph.testdata"; import * as numberLine from "../packages/perseus/src/widgets/number-line/number-line.testdata"; import {Header} from "./header"; diff --git a/packages/perseus-editor/src/__stories__/interactive-graph-editor.stories.tsx b/packages/perseus-editor/src/__stories__/interactive-graph-editor.stories.tsx index 9ec83c3882..a84888f5fc 100644 --- a/packages/perseus-editor/src/__stories__/interactive-graph-editor.stories.tsx +++ b/packages/perseus-editor/src/__stories__/interactive-graph-editor.stories.tsx @@ -20,7 +20,7 @@ import { segmentWithStartingCoordsQuestion, segmentsWithStartingCoordsQuestion, sinusoidWithStartingCoordsQuestion, -} from "../../../perseus/src/widgets/__testdata__/interactive-graph.testdata"; +} from "../../../perseus/src/widgets/interactive-graphs/interactive-graph.testdata"; import {registerAllWidgetsAndEditorsForTesting} from "../util/register-all-widgets-and-editors-for-testing"; import EditorPageWithStorybookPreview from "./editor-page-with-storybook-preview"; diff --git a/packages/perseus/src/__tests__/renderer-api.test.tsx b/packages/perseus/src/__tests__/renderer-api.test.tsx index 15e45360f6..3c02aa207d 100644 --- a/packages/perseus/src/__tests__/renderer-api.test.tsx +++ b/packages/perseus/src/__tests__/renderer-api.test.tsx @@ -12,7 +12,7 @@ import {ClassNames} from "../perseus-api"; import Renderer from "../renderer"; import {mockStrings} from "../strings"; import {registerAllWidgetsForTesting} from "../util/register-all-widgets-for-testing"; -import {renderQuestion} from "../widgets/__tests__/renderQuestion"; +import {renderQuestion} from "../widgets/__testutils__/renderQuestion"; import imageItem from "./test-items/image-item"; import inputNumber1Item from "./test-items/input-number-1-item"; diff --git a/packages/perseus/src/__tests__/renderer.test.tsx b/packages/perseus/src/__tests__/renderer.test.tsx index 89af0eb808..9b0ef825e9 100644 --- a/packages/perseus/src/__tests__/renderer.test.tsx +++ b/packages/perseus/src/__tests__/renderer.test.tsx @@ -18,7 +18,7 @@ import { } from "../__testdata__/renderer.testdata"; import * as Dependencies from "../dependencies"; import {registerWidget} from "../widgets"; -import {renderQuestion} from "../widgets/__tests__/renderQuestion"; +import {renderQuestion} from "../widgets/__testutils__/renderQuestion"; import InputNumberExport from "../widgets/input-number"; import RadioWidgetExport from "../widgets/radio"; diff --git a/packages/perseus/src/components/__tests__/sorter.test.tsx b/packages/perseus/src/components/__tests__/sorter.test.tsx index 9db66d6066..9fcf863ed2 100644 --- a/packages/perseus/src/components/__tests__/sorter.test.tsx +++ b/packages/perseus/src/components/__tests__/sorter.test.tsx @@ -4,7 +4,7 @@ import * as React from "react"; import {testDependencies} from "../../../../../testing/test-dependencies"; import {wait} from "../../../../../testing/wait"; import * as Dependencies from "../../dependencies"; -import {renderQuestion} from "../../widgets/__tests__/renderQuestion"; +import {renderQuestion} from "../../widgets/__testutils__/renderQuestion"; import {question1} from "../__testdata__/sorter.testdata"; import type {APIOptions} from "../../types"; diff --git a/packages/perseus/src/widgets/__tests__/randomizers.test.ts b/packages/perseus/src/widgets/__testdata__/randomizers.test.ts similarity index 97% rename from packages/perseus/src/widgets/__tests__/randomizers.test.ts rename to packages/perseus/src/widgets/__testdata__/randomizers.test.ts index 698286d0b7..6ea83aeafd 100644 --- a/packages/perseus/src/widgets/__tests__/randomizers.test.ts +++ b/packages/perseus/src/widgets/__testdata__/randomizers.test.ts @@ -5,7 +5,7 @@ import { randomLetter, randomSentence, randomWord, -} from "../__testdata__/randomizers"; +} from "./randomizers"; describe("randomizers", () => { describe("randomLetter", () => { diff --git a/packages/perseus/src/widgets/__tests__/renderQuestion.tsx b/packages/perseus/src/widgets/__testutils__/renderQuestion.tsx similarity index 100% rename from packages/perseus/src/widgets/__tests__/renderQuestion.tsx rename to packages/perseus/src/widgets/__testutils__/renderQuestion.tsx diff --git a/packages/perseus/src/widgets/categorizer/categorizer.test.ts b/packages/perseus/src/widgets/categorizer/categorizer.test.ts index 0af66f9acb..abdf88c8fa 100644 --- a/packages/perseus/src/widgets/categorizer/categorizer.test.ts +++ b/packages/perseus/src/widgets/categorizer/categorizer.test.ts @@ -4,7 +4,7 @@ import {userEvent as userEventLib} from "@testing-library/user-event"; import {testDependencies} from "../../../../../testing/test-dependencies"; import * as Dependencies from "../../dependencies"; import {mockStrings} from "../../strings"; -import {renderQuestion} from "../__tests__/renderQuestion"; +import {renderQuestion} from "../__testutils__/renderQuestion"; import {Categorizer} from "./categorizer"; import {question1} from "./categorizer.testdata"; diff --git a/packages/perseus/src/widgets/cs-program/cs-program.test.ts b/packages/perseus/src/widgets/cs-program/cs-program.test.ts index 05c4f56c3c..efd9bc18e1 100644 --- a/packages/perseus/src/widgets/cs-program/cs-program.test.ts +++ b/packages/perseus/src/widgets/cs-program/cs-program.test.ts @@ -1,6 +1,6 @@ import {testDependencies} from "../../../../../testing/test-dependencies"; import * as Dependencies from "../../dependencies"; -import {renderQuestion} from "../__tests__/renderQuestion"; +import {renderQuestion} from "../__testutils__/renderQuestion"; import {question1} from "./cs-program.testdata"; diff --git a/packages/perseus/src/widgets/definition/definition.test.ts b/packages/perseus/src/widgets/definition/definition.test.ts index 930de6fd76..ca931b4a60 100644 --- a/packages/perseus/src/widgets/definition/definition.test.ts +++ b/packages/perseus/src/widgets/definition/definition.test.ts @@ -3,7 +3,7 @@ import {userEvent as userEventLib} from "@testing-library/user-event"; import {testDependencies} from "../../../../../testing/test-dependencies"; import * as Dependencies from "../../dependencies"; -import {renderQuestion} from "../__tests__/renderQuestion"; +import {renderQuestion} from "../__testutils__/renderQuestion"; import type {UserEvent} from "@testing-library/user-event"; diff --git a/packages/perseus/src/widgets/deprecated-standin/__tests__/deprecated-standin.test.ts b/packages/perseus/src/widgets/deprecated-standin/__tests__/deprecated-standin.test.ts index 72ab99c088..f7ef2a3b29 100644 --- a/packages/perseus/src/widgets/deprecated-standin/__tests__/deprecated-standin.test.ts +++ b/packages/perseus/src/widgets/deprecated-standin/__tests__/deprecated-standin.test.ts @@ -1,6 +1,6 @@ import {testDependencies} from "../../../../../../testing/test-dependencies"; import * as Dependencies from "../../../dependencies"; -import {renderQuestion} from "../../__tests__/renderQuestion"; +import {renderQuestion} from "../../__testutils__/renderQuestion"; const question = { content: diff --git a/packages/perseus/src/widgets/dropdown/dropdown.test.ts b/packages/perseus/src/widgets/dropdown/dropdown.test.ts index 8a658b8b81..b236cfeba9 100644 --- a/packages/perseus/src/widgets/dropdown/dropdown.test.ts +++ b/packages/perseus/src/widgets/dropdown/dropdown.test.ts @@ -3,7 +3,7 @@ import {userEvent as userEventLib} from "@testing-library/user-event"; import {testDependencies} from "../../../../../testing/test-dependencies"; import * as Dependencies from "../../dependencies"; -import {renderQuestion} from "../__tests__/renderQuestion"; +import {renderQuestion} from "../__testutils__/renderQuestion"; import {question1} from "./dropdown.testdata"; diff --git a/packages/perseus/src/widgets/explanation/explanation.test.ts b/packages/perseus/src/widgets/explanation/explanation.test.ts index 78ee4f1821..b05eef4fd7 100644 --- a/packages/perseus/src/widgets/explanation/explanation.test.ts +++ b/packages/perseus/src/widgets/explanation/explanation.test.ts @@ -4,7 +4,7 @@ import {userEvent as userEventLib} from "@testing-library/user-event"; import {testDependencies} from "../../../../../testing/test-dependencies"; import * as Dependencies from "../../dependencies"; import * as Changeable from "../../mixins/changeable"; -import {renderQuestion} from "../__tests__/renderQuestion"; +import {renderQuestion} from "../__testutils__/renderQuestion"; import ExplanationWidgetExports from "./explanation"; import {question1} from "./explanation.testdata"; diff --git a/packages/perseus/src/widgets/expression/expression.test.tsx b/packages/perseus/src/widgets/expression/expression.test.tsx index 3192cc7938..cbacacbe74 100644 --- a/packages/perseus/src/widgets/expression/expression.test.tsx +++ b/packages/perseus/src/widgets/expression/expression.test.tsx @@ -8,7 +8,7 @@ import { } from "../../../../../testing/test-dependencies"; import * as Dependencies from "../../dependencies"; import {mockStrings} from "../../strings"; -import {renderQuestion} from "../__tests__/renderQuestion"; +import {renderQuestion} from "../__testutils__/renderQuestion"; import {Expression} from "./expression"; import { diff --git a/packages/perseus/src/widgets/graded-group-set/graded-group-set-jipt.test.ts b/packages/perseus/src/widgets/graded-group-set/graded-group-set-jipt.test.ts index 7c1005c1e4..32dfa96fc9 100644 --- a/packages/perseus/src/widgets/graded-group-set/graded-group-set-jipt.test.ts +++ b/packages/perseus/src/widgets/graded-group-set/graded-group-set-jipt.test.ts @@ -6,7 +6,7 @@ import {testDependencies} from "../../../../../testing/test-dependencies"; import * as Dependencies from "../../dependencies"; -import {renderQuestion} from "../__tests__/renderQuestion"; +import {renderQuestion} from "../__testutils__/renderQuestion"; import {article1} from "./graded-group-set.testdata"; diff --git a/packages/perseus/src/widgets/graded-group-set/graded-group-set.test.ts b/packages/perseus/src/widgets/graded-group-set/graded-group-set.test.ts index 950d38ad6a..65e429794b 100644 --- a/packages/perseus/src/widgets/graded-group-set/graded-group-set.test.ts +++ b/packages/perseus/src/widgets/graded-group-set/graded-group-set.test.ts @@ -3,7 +3,7 @@ import {userEvent as userEventLib} from "@testing-library/user-event"; import {testDependencies} from "../../../../../testing/test-dependencies"; import * as Dependencies from "../../dependencies"; -import {renderQuestion} from "../__tests__/renderQuestion"; +import {renderQuestion} from "../__testutils__/renderQuestion"; import {article1} from "./graded-group-set.testdata"; diff --git a/packages/perseus/src/widgets/graded-group/graded-group.test.ts b/packages/perseus/src/widgets/graded-group/graded-group.test.ts index 6f3f18f1fa..bc0ab1c861 100644 --- a/packages/perseus/src/widgets/graded-group/graded-group.test.ts +++ b/packages/perseus/src/widgets/graded-group/graded-group.test.ts @@ -4,7 +4,7 @@ import {userEvent as userEventLib} from "@testing-library/user-event"; import {testDependencies} from "../../../../../testing/test-dependencies"; import * as Dependencies from "../../dependencies"; -import {renderQuestion} from "../__tests__/renderQuestion"; +import {renderQuestion} from "../__testutils__/renderQuestion"; import {question1} from "./graded-group.testdata"; diff --git a/packages/perseus/src/widgets/grapher/grapher.test.ts b/packages/perseus/src/widgets/grapher/grapher.test.ts index 794a48135d..424ade0a82 100644 --- a/packages/perseus/src/widgets/grapher/grapher.test.ts +++ b/packages/perseus/src/widgets/grapher/grapher.test.ts @@ -1,7 +1,7 @@ import {testDependencies} from "../../../../../testing/test-dependencies"; import {waitForInitialGraphieRender} from "../../../../../testing/wait"; import * as Dependencies from "../../dependencies"; -import {renderQuestion} from "../__tests__/renderQuestion"; +import {renderQuestion} from "../__testutils__/renderQuestion"; import { linearQuestion, diff --git a/packages/perseus/src/widgets/group/group.test.tsx b/packages/perseus/src/widgets/group/group.test.tsx index 1b7d6a8461..4c69e7195d 100644 --- a/packages/perseus/src/widgets/group/group.test.tsx +++ b/packages/perseus/src/widgets/group/group.test.tsx @@ -10,7 +10,7 @@ import {testDependencies} from "../../../../../testing/test-dependencies"; import * as Dependencies from "../../dependencies"; import {mockStrings} from "../../strings"; import {traverse} from "../../traversal"; -import {renderQuestion} from "../__tests__/renderQuestion"; +import {renderQuestion} from "../__testutils__/renderQuestion"; import {question1} from "./group.testdata"; diff --git a/packages/perseus/src/widgets/iframe/iframe.test.ts b/packages/perseus/src/widgets/iframe/iframe.test.ts index ce7a3638a3..082fbbf9dd 100644 --- a/packages/perseus/src/widgets/iframe/iframe.test.ts +++ b/packages/perseus/src/widgets/iframe/iframe.test.ts @@ -1,6 +1,6 @@ import {testDependencies} from "../../../../../testing/test-dependencies"; import * as Dependencies from "../../dependencies"; -import {renderQuestion} from "../__tests__/renderQuestion"; +import {renderQuestion} from "../__testutils__/renderQuestion"; import {question1} from "./iframe.testdata"; diff --git a/packages/perseus/src/widgets/image/image.test.ts b/packages/perseus/src/widgets/image/image.test.ts index c6c9c1c8f9..e79f8a91ca 100644 --- a/packages/perseus/src/widgets/image/image.test.ts +++ b/packages/perseus/src/widgets/image/image.test.ts @@ -3,7 +3,7 @@ import {describe, beforeEach, it} from "@jest/globals"; import {testDependencies} from "../../../../../testing/test-dependencies"; import * as Dependencies from "../../dependencies"; import {isAccessible} from "../../widgets"; -import {renderQuestion} from "../__tests__/renderQuestion"; +import {renderQuestion} from "../__testutils__/renderQuestion"; import {question} from "./image.testdata"; diff --git a/packages/perseus/src/widgets/input-number/input-number.test.ts b/packages/perseus/src/widgets/input-number/input-number.test.ts index c4fe55b8d5..51d7fe8a5b 100644 --- a/packages/perseus/src/widgets/input-number/input-number.test.ts +++ b/packages/perseus/src/widgets/input-number/input-number.test.ts @@ -9,7 +9,7 @@ import _ from "underscore"; import {testDependencies} from "../../../../../testing/test-dependencies"; import * as Dependencies from "../../dependencies"; import {mockStrings} from "../../strings"; -import {renderQuestion} from "../__tests__/renderQuestion"; +import {renderQuestion} from "../__testutils__/renderQuestion"; import InputNumber from "./input-number"; import {question3 as question} from "./input-number.testdata"; diff --git a/packages/perseus/src/widgets/interaction/interaction.test.ts b/packages/perseus/src/widgets/interaction/interaction.test.ts index 358bcad137..f693ad33de 100644 --- a/packages/perseus/src/widgets/interaction/interaction.test.ts +++ b/packages/perseus/src/widgets/interaction/interaction.test.ts @@ -1,7 +1,7 @@ import {testDependencies} from "../../../../../testing/test-dependencies"; import {waitForInitialGraphieRender} from "../../../../../testing/wait"; import * as Dependencies from "../../dependencies"; -import {renderQuestion} from "../__tests__/renderQuestion"; +import {renderQuestion} from "../__testutils__/renderQuestion"; import {question1} from "./interaction.testdata"; diff --git a/packages/perseus/src/widgets/__tests__/__snapshots__/interactive-graph.test.tsx.snap b/packages/perseus/src/widgets/interactive-graphs/__snapshots__/interactive-graph.test.tsx.snap similarity index 100% rename from packages/perseus/src/widgets/__tests__/__snapshots__/interactive-graph.test.tsx.snap rename to packages/perseus/src/widgets/interactive-graphs/__snapshots__/interactive-graph.test.tsx.snap diff --git a/packages/perseus/src/widgets/__stories__/interactive-graph-regression.stories.tsx b/packages/perseus/src/widgets/interactive-graphs/interactive-graph-regression.stories.tsx similarity index 98% rename from packages/perseus/src/widgets/__stories__/interactive-graph-regression.stories.tsx rename to packages/perseus/src/widgets/interactive-graphs/interactive-graph-regression.stories.tsx index 7454ea497a..e58bdaa8f7 100644 --- a/packages/perseus/src/widgets/__stories__/interactive-graph-regression.stories.tsx +++ b/packages/perseus/src/widgets/interactive-graphs/interactive-graph-regression.stories.tsx @@ -2,7 +2,8 @@ import * as React from "react"; import Renderer from "../../renderer"; import {mockStrings} from "../../strings"; -import {interactiveGraphQuestionBuilder} from "../interactive-graphs/interactive-graph-question-builder"; + +import {interactiveGraphQuestionBuilder} from "./interactive-graph-question-builder"; import type {PerseusRenderer} from "../../perseus-types"; diff --git a/packages/perseus/src/widgets/__stories__/interactive-graph.stories.tsx b/packages/perseus/src/widgets/interactive-graphs/interactive-graph.stories.tsx similarity index 98% rename from packages/perseus/src/widgets/__stories__/interactive-graph.stories.tsx rename to packages/perseus/src/widgets/interactive-graphs/interactive-graph.stories.tsx index e35cc18ec2..34fef89c92 100644 --- a/packages/perseus/src/widgets/__stories__/interactive-graph.stories.tsx +++ b/packages/perseus/src/widgets/interactive-graphs/interactive-graph.stories.tsx @@ -2,6 +2,7 @@ import * as React from "react"; import {Flipbook} from "../../../../../dev/flipbook"; import {RendererWithDebugUI} from "../../../../../testing/renderer-with-debug-ui"; + import { angleQuestion, circleQuestion, @@ -23,7 +24,7 @@ import { staticGraphQuestion, staticGraphQuestionWithAnotherWidget, segmentWithLockedLabels, -} from "../__testdata__/interactive-graph.testdata"; +} from "./interactive-graph.testdata"; import type {APIOptions} from "../../types"; diff --git a/packages/perseus/src/widgets/__tests__/interactive-graph.test.tsx b/packages/perseus/src/widgets/interactive-graphs/interactive-graph.test.tsx similarity index 99% rename from packages/perseus/src/widgets/__tests__/interactive-graph.test.tsx rename to packages/perseus/src/widgets/interactive-graphs/interactive-graph.test.tsx index f670c90507..1e2c9c90dc 100644 --- a/packages/perseus/src/widgets/__tests__/interactive-graph.test.tsx +++ b/packages/perseus/src/widgets/interactive-graphs/interactive-graph.test.tsx @@ -11,6 +11,9 @@ import {waitForInitialGraphieRender} from "../../../../../testing/wait"; import * as Dependencies from "../../dependencies"; import {ApiOptions} from "../../perseus-api"; import {lockedFigureColors} from "../../perseus-types"; +import {renderQuestion} from "../__testutils__/renderQuestion"; +import {sinusoidQuestion} from "../grapher/grapher.testdata"; + import { angleQuestion, angleQuestionWithDefaultCorrect, @@ -42,17 +45,14 @@ import { segmentWithLockedPolygonWhite, segmentWithLockedVectors, sinusoidQuestionWithDefaultCorrect, -} from "../__testdata__/interactive-graph.testdata"; -import {sinusoidQuestion} from "../grapher/grapher.testdata"; -import {trueForAllMafsSupportedGraphTypes} from "../interactive-graphs/mafs-supported-graph-types"; - -import {renderQuestion} from "./renderQuestion"; +} from "./interactive-graph.testdata"; +import {trueForAllMafsSupportedGraphTypes} from "./mafs-supported-graph-types"; +import type {mafsSupportedGraphTypes} from "./mafs-supported-graph-types"; import type {Coord} from "../../interactive2/types"; import type {PerseusRenderer} from "../../perseus-types"; import type Renderer from "../../renderer"; import type {APIOptions} from "../../types"; -import type {mafsSupportedGraphTypes} from "../interactive-graphs/mafs-supported-graph-types"; import type {UserEvent} from "@testing-library/user-event"; const updateWidgetState = (renderer: Renderer, widgetId: string, update) => { diff --git a/packages/perseus/src/widgets/__testdata__/interactive-graph.testdata.ts b/packages/perseus/src/widgets/interactive-graphs/interactive-graph.testdata.ts similarity index 99% rename from packages/perseus/src/widgets/__testdata__/interactive-graph.testdata.ts rename to packages/perseus/src/widgets/interactive-graphs/interactive-graph.testdata.ts index 96bd5e0b44..e4eebf19b1 100644 --- a/packages/perseus/src/widgets/__testdata__/interactive-graph.testdata.ts +++ b/packages/perseus/src/widgets/interactive-graphs/interactive-graph.testdata.ts @@ -1,8 +1,8 @@ -import {interactiveGraphQuestionBuilder} from "../interactive-graphs/interactive-graph-question-builder"; +import {interactiveGraphQuestionBuilder} from "./interactive-graph-question-builder"; +import type {LockedFunctionOptions} from "./interactive-graph-question-builder"; import type {Coord} from "../../interactive2/types"; import type {PerseusRenderer, RadioWidget} from "../../perseus-types"; -import type {LockedFunctionOptions} from "../interactive-graphs/interactive-graph-question-builder"; // Data for the interactive graph widget diff --git a/packages/perseus/src/widgets/__stories__/locked-functions.stories.tsx b/packages/perseus/src/widgets/interactive-graphs/locked-figures/locked-functions.stories.tsx similarity index 94% rename from packages/perseus/src/widgets/__stories__/locked-functions.stories.tsx rename to packages/perseus/src/widgets/interactive-graphs/locked-figures/locked-functions.stories.tsx index 9fa6fec702..bceb42567e 100644 --- a/packages/perseus/src/widgets/__stories__/locked-functions.stories.tsx +++ b/packages/perseus/src/widgets/interactive-graphs/locked-figures/locked-functions.stories.tsx @@ -1,7 +1,7 @@ import * as React from "react"; -import {RendererWithDebugUI} from "../../../../../testing/renderer-with-debug-ui"; -import {segmentWithLockedFunction} from "../__testdata__/interactive-graph.testdata"; +import {RendererWithDebugUI} from "../../../../../../testing/renderer-with-debug-ui"; +import {segmentWithLockedFunction} from "../interactive-graph.testdata"; export default { title: "Perseus/Widgets/Interactive Graph/Locked Functions", diff --git a/packages/perseus/src/widgets/label-image/__tests__/label-image.test.ts b/packages/perseus/src/widgets/label-image/__tests__/label-image.test.ts index 8da6ef5533..6c7dfc10ef 100644 --- a/packages/perseus/src/widgets/label-image/__tests__/label-image.test.ts +++ b/packages/perseus/src/widgets/label-image/__tests__/label-image.test.ts @@ -6,7 +6,7 @@ import { testDependenciesV2, } from "../../../../../../testing/test-dependencies"; import * as Dependencies from "../../../dependencies"; -import {renderQuestion} from "../../__tests__/renderQuestion"; +import {renderQuestion} from "../../__testutils__/renderQuestion"; import {LabelImage} from "../label-image"; import {textQuestion} from "./label-image.testdata"; diff --git a/packages/perseus/src/widgets/matcher/matcher.test.tsx b/packages/perseus/src/widgets/matcher/matcher.test.tsx index 962da4e9d6..61872ecc16 100644 --- a/packages/perseus/src/widgets/matcher/matcher.test.tsx +++ b/packages/perseus/src/widgets/matcher/matcher.test.tsx @@ -4,7 +4,7 @@ import * as React from "react"; import {testDependencies} from "../../../../../testing/test-dependencies"; import {wait} from "../../../../../testing/wait"; import * as Dependencies from "../../dependencies"; -import {renderQuestion} from "../__tests__/renderQuestion"; +import {renderQuestion} from "../__testutils__/renderQuestion"; import {question1} from "./matcher.testdata"; diff --git a/packages/perseus/src/widgets/matrix/matrix.test.ts b/packages/perseus/src/widgets/matrix/matrix.test.ts index 21d05e17bf..05aebbdcad 100644 --- a/packages/perseus/src/widgets/matrix/matrix.test.ts +++ b/packages/perseus/src/widgets/matrix/matrix.test.ts @@ -3,7 +3,7 @@ import {userEvent as userEventLib} from "@testing-library/user-event"; import {testDependencies} from "../../../../../testing/test-dependencies"; import * as Dependencies from "../../dependencies"; -import {renderQuestion} from "../__tests__/renderQuestion"; +import {renderQuestion} from "../__testutils__/renderQuestion"; import {question1} from "./matrix.testdata"; diff --git a/packages/perseus/src/widgets/number-line/number-line.test.ts b/packages/perseus/src/widgets/number-line/number-line.test.ts index ac6668d0de..9926d3e60c 100644 --- a/packages/perseus/src/widgets/number-line/number-line.test.ts +++ b/packages/perseus/src/widgets/number-line/number-line.test.ts @@ -2,7 +2,7 @@ import {act} from "@testing-library/react"; import {testDependencies} from "../../../../../testing/test-dependencies"; import * as Dependencies from "../../dependencies"; -import {renderQuestion} from "../__tests__/renderQuestion"; +import {renderQuestion} from "../__testutils__/renderQuestion"; import {question1} from "./number-line.testdata"; diff --git a/packages/perseus/src/widgets/numeric-input/numeric-input.test.ts b/packages/perseus/src/widgets/numeric-input/numeric-input.test.ts index f664fefb20..6bcfa069ae 100644 --- a/packages/perseus/src/widgets/numeric-input/numeric-input.test.ts +++ b/packages/perseus/src/widgets/numeric-input/numeric-input.test.ts @@ -4,7 +4,7 @@ import {userEvent as userEventLib} from "@testing-library/user-event"; import {testDependencies} from "../../../../../testing/test-dependencies"; import * as Dependencies from "../../dependencies"; import {mockStrings} from "../../strings"; -import {renderQuestion} from "../__tests__/renderQuestion"; +import {renderQuestion} from "../__testutils__/renderQuestion"; import { maybeParsePercentInput, diff --git a/packages/perseus/src/widgets/orderer/orderer.test.ts b/packages/perseus/src/widgets/orderer/orderer.test.ts index ab7ca31fa3..a051d8d94a 100644 --- a/packages/perseus/src/widgets/orderer/orderer.test.ts +++ b/packages/perseus/src/widgets/orderer/orderer.test.ts @@ -2,7 +2,7 @@ import {act} from "@testing-library/react"; import {testDependencies} from "../../../../../testing/test-dependencies"; import * as Dependencies from "../../dependencies"; -import {renderQuestion} from "../__tests__/renderQuestion"; +import {renderQuestion} from "../__testutils__/renderQuestion"; import {question2} from "./orderer.testdata"; diff --git a/packages/perseus/src/widgets/passage-ref/passage-ref.test.ts b/packages/perseus/src/widgets/passage-ref/passage-ref.test.ts index 184fea2139..25aaba4f1d 100644 --- a/packages/perseus/src/widgets/passage-ref/passage-ref.test.ts +++ b/packages/perseus/src/widgets/passage-ref/passage-ref.test.ts @@ -2,7 +2,7 @@ import {act, screen} from "@testing-library/react"; import {testDependencies} from "../../../../../testing/test-dependencies"; import * as Dependencies from "../../dependencies"; -import {renderQuestion} from "../__tests__/renderQuestion"; +import {renderQuestion} from "../__testutils__/renderQuestion"; import PassageExport from "../passage"; import {question1} from "./passage-ref.testdata"; diff --git a/packages/perseus/src/widgets/passage/__tests__/passage.test.tsx b/packages/perseus/src/widgets/passage/__tests__/passage.test.tsx index 58ba793a5a..e78bcacc34 100644 --- a/packages/perseus/src/widgets/passage/__tests__/passage.test.tsx +++ b/packages/perseus/src/widgets/passage/__tests__/passage.test.tsx @@ -5,7 +5,7 @@ import React from "react"; import {testDependencies} from "../../../../../../testing/test-dependencies"; import * as Dependencies from "../../../dependencies"; import {ApiOptions} from "../../../perseus-api"; -import {renderQuestion} from "../../__tests__/renderQuestion"; +import {renderQuestion} from "../../__testutils__/renderQuestion"; import PassageWidgetExport, {LineHeightMeasurer} from "../passage"; import {question1, question2} from "./passage.testdata"; diff --git a/packages/perseus/src/widgets/phet-simulation/phet-simulation.test.ts b/packages/perseus/src/widgets/phet-simulation/phet-simulation.test.ts index 44b7aae1e7..6bfccb7798 100644 --- a/packages/perseus/src/widgets/phet-simulation/phet-simulation.test.ts +++ b/packages/perseus/src/widgets/phet-simulation/phet-simulation.test.ts @@ -2,7 +2,7 @@ import {screen, waitFor} from "@testing-library/react"; import {testDependencies} from "../../../../../testing/test-dependencies"; import * as Dependencies from "../../dependencies"; -import {renderQuestion} from "../__tests__/renderQuestion"; +import {renderQuestion} from "../__testutils__/renderQuestion"; import {makeSafeUrl} from "./phet-simulation"; import {nonPhetUrl, question1} from "./phet-simulation.testdata"; diff --git a/packages/perseus/src/widgets/python-program/python-program.test.ts b/packages/perseus/src/widgets/python-program/python-program.test.ts index bfe47cf516..08a45efe80 100644 --- a/packages/perseus/src/widgets/python-program/python-program.test.ts +++ b/packages/perseus/src/widgets/python-program/python-program.test.ts @@ -1,4 +1,4 @@ -import {renderQuestion} from "../__tests__/renderQuestion"; +import {renderQuestion} from "../__testutils__/renderQuestion"; import {question1} from "./python-program.testdata"; diff --git a/packages/perseus/src/widgets/radio/__tests__/radio.test.ts b/packages/perseus/src/widgets/radio/__tests__/radio.test.ts index 73d0854264..f5f6d3d692 100644 --- a/packages/perseus/src/widgets/radio/__tests__/radio.test.ts +++ b/packages/perseus/src/widgets/radio/__tests__/radio.test.ts @@ -5,7 +5,7 @@ import {userEvent as userEventLib} from "@testing-library/user-event"; import {clone} from "../../../../../../testing/object-utils"; import {testDependencies} from "../../../../../../testing/test-dependencies"; import * as Dependencies from "../../../dependencies"; -import {renderQuestion} from "../../__tests__/renderQuestion"; +import {renderQuestion} from "../../__testutils__/renderQuestion"; import PassageWidget from "../../passage"; import { diff --git a/packages/perseus/src/widgets/video/video.test.ts b/packages/perseus/src/widgets/video/video.test.ts index 6c0c5cd7b0..1e07af2b23 100644 --- a/packages/perseus/src/widgets/video/video.test.ts +++ b/packages/perseus/src/widgets/video/video.test.ts @@ -1,6 +1,6 @@ import {testDependencies} from "../../../../../testing/test-dependencies"; import * as Dependencies from "../../dependencies"; -import {renderQuestion} from "../__tests__/renderQuestion"; +import {renderQuestion} from "../__testutils__/renderQuestion"; import {question1, question2} from "./video.testdata"; diff --git a/packages/tsconfig-shared.json b/packages/tsconfig-shared.json index 2043253aa7..7b37b07c9e 100644 --- a/packages/tsconfig-shared.json +++ b/packages/tsconfig-shared.json @@ -7,6 +7,7 @@ "**/__tests__/**", "**/*.testdata.*", "**/__testdata__/**", + "**/__testutils__/**", "**/*.stories.*", "**/__stories__/**", "**/*.cypress.*"