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.

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

refactor: Explicitly export shapeFactory #2761

Merged
merged 1 commit into from
Aug 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { routePatternFactory } from "../../tests/factories/routePattern"
import routeFactory from "../../tests/factories/route"
import { RoutesProvider } from "../../src/contexts/routesContext"
import { stopFactory } from "../../tests/factories/stop"
import shapeFactory from "../../tests/factories/shape"
import { shapeFactory } from "../../tests/factories/shape"

const outboundStops = [
stopFactory.build({ name: "Watertown Square" }),
Expand Down
2 changes: 1 addition & 1 deletion assets/tests/components/map.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import { setHtmlDefaultWidthHeight } from "../testHelpers/leafletMapWidth"
import { mockScreenSize, mockTileUrls } from "../testHelpers/mockHelpers"
import { streetViewModeSwitch } from "../testHelpers/selectors/components/mapPage/map"
import { streetViewUrl } from "../../src/util/streetViewUrl"
import shapeFactory from "../factories/shape"
import { shapeFactory } from "../factories/shape"
import { fullStoryEvent } from "../../src/helpers/fullStory"
import { recenterControl } from "../testHelpers/selectors/components/map/controls/recenterControl"

Expand Down
2 changes: 1 addition & 1 deletion assets/tests/components/mapPage/mapDisplay.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ import {
mockUsePatternsByIdForVehicles,
} from "../../testHelpers/mockHelpers"

import shapeFactory from "../../factories/shape"
import { shapeFactory } from "../../factories/shape"
import { zoomInButton } from "../../testHelpers/selectors/components/map"
import { stopIcon } from "../../testHelpers/selectors/components/map/markers/stopIcon"
import { routePropertiesCard } from "../../testHelpers/selectors/components/mapPage/routePropertiesCard"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import RoutePropertiesCard, {
} from "../../../src/components/mapPage/routePropertiesCard"
import { routePatternFactory } from "../../factories/routePattern"
import routeFactory from "../../factories/route"
import shapeFactory from "../../factories/shape"
import { shapeFactory } from "../../factories/shape"
import { stopFactory } from "../../factories/stop"

import { RoutesProvider } from "../../../src/contexts/routesContext"
Expand Down
2 changes: 1 addition & 1 deletion assets/tests/components/shuttleMapPage.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { initialState } from "../../src/state"
import * as dateTime from "../../src/util/dateTime"
import { shuttleFactory } from "../factories/vehicle"
import userEvent from "@testing-library/user-event"
import shapeFactory from "../factories/shape"
import { shapeFactory } from "../factories/shape"
import {
layersControlButton,
zoomInButton,
Expand Down
4 changes: 2 additions & 2 deletions assets/tests/factories/routePattern.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Factory } from "fishery"
import { RoutePattern } from "../../src/schedule"
import shape from "./shape"
import { shapeFactory } from "./shape"

export const routePatternFactory = Factory.define<RoutePattern>(
({ sequence }) => ({
Expand All @@ -9,7 +9,7 @@ export const routePatternFactory = Factory.define<RoutePattern>(
routeId: "66",
directionId: 0,
sortOrder: sequence,
shape: shape.build(),
shape: shapeFactory.build(),
headsign: `Headsign ${sequence}`,
})
)
4 changes: 1 addition & 3 deletions assets/tests/factories/shape.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@ import { Factory } from "fishery"
import { Shape } from "../../src/schedule"
import { stopFactory } from "./stop"

const shapeFactory = Factory.define<Shape>(({ sequence }) => ({
export const shapeFactory = Factory.define<Shape>(({ sequence }) => ({
id: `shape${sequence}`,
points: [{ lat: 0, lon: 0 }],
stops: [stopFactory.build({ id: `stop${sequence}` })],
}))

export default shapeFactory
2 changes: 1 addition & 1 deletion assets/tests/hooks/useShapes.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import * as Api from "../../src/api"
import { useRouteShapes, useTripShape } from "../../src/hooks/useShapes"
import { Shape, Stop } from "../../src/schedule.d"
import { instantPromise, mockUseStateOnce } from "../testHelpers/mockHelpers"
import shapeFactory from "../factories/shape"
import { shapeFactory } from "../factories/shape"
import { stopFactory } from "../factories/stop"

jest.mock("../../src/api", () => ({
Expand Down
2 changes: 1 addition & 1 deletion assets/tests/models/shapeData.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
shapesFromData,
} from "../../src/models/shapeData"
import { shapeDataFactory } from "../factories/shape_data"
import shapeFactory from "../factories/shape"
import { shapeFactory } from "../factories/shape"
import { stopDataFactory } from "../factories/stopData"
import { stopsFromData } from "../../src/models/stopData"

Expand Down
2 changes: 1 addition & 1 deletion assets/tests/models/subwayRoute.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
isASubwayRoute,
subwayRoutes,
} from "../../src/models/subwayRoute"
import shapeFactory from "../factories/shape"
import { shapeFactory } from "../factories/shape"
import { stopFactory } from "../factories/stop"

const subwayLineIds = ["Blue", "Green", "Orange", "Red", "Mattapan"]
Expand Down
4 changes: 2 additions & 2 deletions assets/tests/testHelpers/mockHelpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { VehicleInScheduledService, Ghost } from "../../src/realtime"
import { routePatternFactory } from "../factories/routePattern"
import { stopFactory } from "../factories/stop"

import shape from "../factories/shape"
import { shapeFactory } from "../factories/shape"
import { TileType, tilesetUrlForType } from "../../src/tilesetUrls"

/**
Expand Down Expand Up @@ -66,7 +66,7 @@ export const mockUsePatternsByIdForVehicles = (
id: routePatternId!,
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
routeId: routeId!,
shape: shape.build({
shape: shapeFactory.build({
stops: stopFactory.buildList(params?.stopCount || 2),
}),
})
Expand Down
Loading