Consolidate Interactive Graph tests and stories

.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.

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";

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";

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";

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";
 

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";

packages/perseus/src/widgets/__tests__/randomizers.test.ts → 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", () => {

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";

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";
 

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";
 

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:

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";
 

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";

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 {

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";
 

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";
 

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";
 

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,

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";
 

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";
 

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";
 

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";

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";
 

packages/perseus/src/widgets/__stories__/interactive-graph-regression.stories.tsx → 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";
 

packages/perseus/src/widgets/__stories__/interactive-graph.stories.tsx → 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";
 

packages/perseus/src/widgets/__tests__/interactive-graph.test.tsx → 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) => {

packages/perseus/src/widgets/__testdata__/interactive-graph.testdata.ts → 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
 

packages/perseus/src/widgets/__stories__/locked-functions.stories.tsx → 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",

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";

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";
 

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";
 

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";
 

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,

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";
 

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";

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";

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";

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";
 

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 {

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";
 

packages/tsconfig-shared.json

@@ -7,6 +7,7 @@
         "**/__tests__/**",
         "**/*.testdata.*",
         "**/__testdata__/**",
+        "**/__testutils__/**",
         "**/*.stories.*",
         "**/__stories__/**",
         "**/*.cypress.*"