Skip to content
Open
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
2 changes: 1 addition & 1 deletion api/src/services/listing-csv-export.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1762,7 +1762,7 @@ export class ListingCsvExporterService implements CsvExporterServiceInterface {
},
{
path: 'unit.accessibilityPriorityType',
label: 'Accessibility Priority Type',
label: 'Accessibility Unit Type',
},
];
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,12 @@ describe("UnitForm", () => {
expect(screen.getByRole("textbox", { name: "Unit number" })).toBeInTheDocument()

// Unit type dropdown selector
const unitTypeSelector = screen.getByRole("combobox", { name: /unit type/i })
const unitTypeSelector = screen.getByRole("combobox", { name: /^unit type/i })
expect(unitTypeSelector).toBeInTheDocument()
expect(within(unitTypeSelector).getAllByRole("option")).toHaveLength(8)
expect(within(unitTypeSelector).getByRole("option", { name: /unit type/i })).toBeInTheDocument()
expect(
within(unitTypeSelector).getByRole("option", { name: /^unit type/i })
).toBeInTheDocument()
expect(within(unitTypeSelector).getByRole("option", { name: "Studio" })).toBeInTheDocument()
expect(within(unitTypeSelector).getByRole("option", { name: "SRO" })).toBeInTheDocument()
expect(
Expand Down Expand Up @@ -197,9 +199,9 @@ describe("UnitForm", () => {

expect(screen.getByRole("heading", { name: "Accessibility", level: 2 })).toBeInTheDocument()

// Accessibility priority type selector
// Accessibility unit type selector
const priorityTypeSelector = screen.getByRole("combobox", {
name: "Accessibility priority type",
name: "Accessibility unit type",
})
expect(priorityTypeSelector).toBeInTheDocument()
expect(within(priorityTypeSelector).getAllByRole("option")).toHaveLength(4)
Expand Down Expand Up @@ -398,7 +400,7 @@ describe("UnitForm", () => {

await waitFor(() => {
expect(screen.getByRole("textbox", { name: "Unit number" })).toHaveValue("A-101")
expect(screen.getByRole("combobox", { name: /unit type/i })).toHaveValue(unitTypes[0].id)
expect(screen.getByRole("combobox", { name: /^unit type/i })).toHaveValue(unitTypes[0].id)
expect(screen.getByLabelText(/square footage/i)).toHaveValue(321)
expect(screen.getByLabelText(/minimum monthly income|monthly minimum income/i)).toHaveValue(
2208
Expand Down Expand Up @@ -454,7 +456,7 @@ describe("UnitForm", () => {

await waitFor(() => {
expect(screen.getByRole("textbox", { name: "Unit number" })).toHaveValue("B-202")
expect(screen.getByRole("combobox", { name: /unit type/i })).toHaveValue(unitTypes[1].id)
expect(screen.getByRole("combobox", { name: /^unit type/i })).toHaveValue(unitTypes[1].id)
expect(screen.getByLabelText(/square footage/i)).toHaveValue(456)
expect(screen.getByLabelText(/minimum monthly income|monthly minimum income/i)).toHaveValue(
3200
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ describe("<UnitGroupForm>", () => {
expect(screen.getAllByRole("heading", { level: 2, name: /details/i })).toHaveLength(2)

// Unit Types Section
expect(screen.getByText(/unit type/i)).toBeInTheDocument()
expect(screen.getByText(/^unit type/i)).toBeInTheDocument()
expect(await screen.findByLabelText(/studio/i)).toBeInTheDocument()
expect(screen.getByLabelText(/1 bedroom/i)).toBeInTheDocument()
expect(screen.getByLabelText(/2 bedroom/i)).toBeInTheDocument()
Expand Down Expand Up @@ -319,7 +319,7 @@ describe("<UnitGroupForm>", () => {
expect(screen.getAllByRole("heading", { level: 2, name: /details/i })).toHaveLength(2)

// Unit Types Section
expect(screen.getByText(/unit type/i)).toBeInTheDocument()
expect(screen.getByText(/^unit type/i)).toBeInTheDocument()
expect(await screen.findByRole("checkbox", { name: /studio/i })).toBeInTheDocument()
expect(screen.getByRole("checkbox", { name: /1 bedroom/i })).toBeInTheDocument()
expect(screen.getByRole("checkbox", { name: /2 bedroom/i })).toBeInTheDocument()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ describe("PaperListingForm", () => {
// units
expect(
screen.getByRole("row", {
name: "Unit # Unit type AMI Rent SQ FT Accessibility priority type Actions",
name: "Unit # Unit type AMI Rent SQ FT Accessibility unit type Actions",
})
).toBeInTheDocument()
expect(
Expand Down
6 changes: 2 additions & 4 deletions sites/partners/__tests__/pages/listings/[id]/index.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@ describe("listing data", () => {
expect(screen.getByText("AMI")).toBeInTheDocument()
expect(screen.getByText("Rent")).toBeInTheDocument()
expect(screen.getByText("SQ FT")).toBeInTheDocument()
expect(screen.getByText("Accessibility priority type")).toBeInTheDocument()
expect(screen.getByText("Accessibility unit type")).toBeInTheDocument()

expect(screen.getAllByText(/#[1-9]/i)).toHaveLength(6)
expect(screen.getAllByText("Studio")).toHaveLength(6)
Expand Down Expand Up @@ -2089,9 +2089,7 @@ describe("listing data", () => {
})
expect(accessibilitySectionHeader).toBeInTheDocument()
const accessibilitySection = accessibilitySectionHeader.parentElement
expect(
within(accessibilitySection).getByText("Accessibility priority type")
).toBeInTheDocument()
expect(within(accessibilitySection).getByText("Accessibility unit type")).toBeInTheDocument()
expect(within(accessibilitySection).getByText("Mobility")).toBeInTheDocument()

// Should close on done
Expand Down
2 changes: 1 addition & 1 deletion sites/partners/page_content/locales/general.json
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@
"listings.streetAddressOrPOBox": "Street address or PO box",
"listings.totalListings": "Total listings",
"listings.unit.%incomeRent": "Percentage of income rent",
"listings.unit.accessibilityPriorityType": "Accessibility priority type",
"listings.unit.accessibilityUnitType": "Accessibility unit type",
"listings.unit.add": "Add unit",
"listings.unit.affordableGroupQuantity": "Unit Group Quantity",
"listings.unit.ami": "AMI",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ const DetailUnitDrawer = ({ unit, setUnitDrawer }: UnitDrawerProps) => {
<Grid.Cell>
<FieldValue
id="unit.accessibilityPriorityType"
label={t("listings.unit.accessibilityPriorityType")}
label={t("listings.unit.accessibilityUnitType")}
children={
unit?.accessibilityPriorityType
? t(`listings.unit.accessibilityType.${unit.accessibilityPriorityType}`)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ const DetailUnits = ({ setUnitDrawer }: DetailUnitsProps) => {
amiPercentage: "t.ami",
monthlyRent: "listings.unit.rent",
sqFeet: "listings.unit.sqft",
accessibilityPriorityType: "listings.unit.accessibilityPriorityType",
accessibilityPriorityType: "listings.unit.accessibilityUnitType",
action: "",
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@ const UnitForm = ({
<Select
id="accessibilityPriorityType"
name="accessibilityPriorityType"
label={t("listings.unit.accessibilityPriorityType")}
label={t("listings.unit.accessibilityUnitType")}
register={register}
controlClassName="control"
options={[{ value: "", label: t("t.selectOne") }, ...unitPrioritiesOptions]}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ const FormUnits = ({
amiPercentage: "t.ami",
monthlyRent: "listings.unit.rent",
sqFeet: "listings.unit.sqft",
accessibilityPriorityType: "listings.unit.accessibilityPriorityType",
accessibilityPriorityType: "listings.unit.accessibilityUnitType",
action: "",
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ describe("<MainDetails>", () => {
expect(view.queryByText("Veteran")).toBeNull()
})

it("shows accessibility priority type tags when feature flag is enabled", () => {
it("shows accessibility unit type tags when feature flag is enabled", () => {
render(
<MainDetails
listing={{
Expand Down Expand Up @@ -127,7 +127,7 @@ describe("<MainDetails>", () => {
expect(screen.getByText("Mobility, hearing and vision units")).toBeInTheDocument()
})

it("hides accessibility priority type tags when feature flag is disabled", () => {
it("hides accessibility unit type tags when feature flag is disabled", () => {
render(
<MainDetails
listing={{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ describe("<RentSummary>", () => {
expect(tableHeaders).toHaveLength(3)

const [unitTypeHeader, rentHeader, availabilityHeader] = tableHeaders
expect(unitTypeHeader).toHaveTextContent(/unit type/i)
expect(unitTypeHeader).toHaveTextContent(/^unit type/i)
expect(rentHeader).toHaveTextContent(/rent/i)
expect(availabilityHeader).toHaveTextContent(/availability/i)

Expand Down
Loading