Skip to content

Commit

Permalink
Merge branch 'develop' into MAT-7407
Browse files Browse the repository at this point in the history
  • Loading branch information
@adongare
adongare authored Oct 3, 2024
2 parents 85eeb68 + c840657 commit 7a4a149
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 48 deletions.
8 changes: 4 additions & 4 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
"@emotion/styled": "^11.6.0",
"@heroicons/react": "^1.0.5",
"@lhncbc/ucum-lhc": "^4.1.5",
"@madie/cql-antlr-parser": "^1.0.3",
"@madie/cql-antlr-parser": "^1.0.4",
"@madie/madie-auth": "^0.0.1",
"@madie/madie-design-system": "^1.2.23",
"@madie/madie-editor": "^0.0.1",
Expand Down
16 changes: 8 additions & 8 deletions src/components/editMeasure/populationCriteria/PopulationCriteriaHome.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ describe("PopulationCriteriaHome", () => {
).toBeInTheDocument();

expect(
screen.queryByText("SDE Ethnicity - Include in Report Type")
screen.queryByText('"SDE Ethnicity" - Include in Report Type')
).not.toBeInTheDocument();
});

Expand All @@ -355,14 +355,14 @@ describe("PopulationCriteriaHome", () => {

userEvent.click(screen.getByRole("button", { name: "Open" }));
await waitFor(() => {
userEvent.click(screen.getByText('SDE."SDE Ethnicity"'));
userEvent.click(screen.getByText('"SDE Ethnicity"'));
});
expect(
screen.getByRole("button", { name: 'SDE."SDE Ethnicity"' })
screen.getByRole("button", { name: '"SDE Ethnicity"' })
).toBeInTheDocument();

expect(
await screen.findByText('SDE."SDE Ethnicity" - Include in Report Type')
await screen.findByText('"SDE Ethnicity" - Include in Report Type')
).toBeInTheDocument();

const allComboBoxes2 = screen.getAllByRole("combobox");
Expand Down Expand Up @@ -403,7 +403,7 @@ describe("PopulationCriteriaHome", () => {
).toBeInTheDocument();

expect(
screen.queryByText('SDE."SDE Ethnicity" - Include in Report Type')
screen.queryByText("SDE Ethnicity - Include in Report Type")
).not.toBeInTheDocument();
});

Expand All @@ -422,14 +422,14 @@ describe("PopulationCriteriaHome", () => {

userEvent.click(screen.getByRole("button", { name: "Open" }));
await waitFor(() => {
userEvent.click(screen.getByText('SDE."SDE Ethnicity"'));
userEvent.click(screen.getByText('"SDE Ethnicity"'));
});
expect(
screen.getByRole("button", { name: 'SDE."SDE Ethnicity"' })
screen.getByRole("button", { name: '"SDE Ethnicity"' })
).toBeInTheDocument();

expect(
await screen.findByText('SDE."SDE Ethnicity" - Include in Report Type')
await screen.findByText('"SDE Ethnicity" - Include in Report Type')
).toBeInTheDocument();

const allComboBoxes2 = screen.getAllByRole("combobox");
Expand Down
26 changes: 13 additions & 13 deletions src/components/editMeasure/populationCriteria/riskAdjustment/qdm/RiskAdjustment.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ describe("QdmRiskAdjustment Component", () => {
description: "",
},
{
definition: 'SDE."SDE Ethnicity"',
definition: '"SDE Ethnicity"',
description: "",
},
];
Expand Down Expand Up @@ -160,10 +160,10 @@ describe("QdmRiskAdjustment Component", () => {

userEvent.click(riskAdjustmentButton);
await waitFor(() => {
userEvent.click(screen.getByText('SDE."SDE Ethnicity"'));
userEvent.click(screen.getByText('"SDE Ethnicity"'));
});
expect(
screen.getByRole("button", { name: 'SDE."SDE Ethnicity"' })
screen.getByRole("button", { name: '"SDE Ethnicity"' })
).toBeInTheDocument();

// Verifies if RA description already loads values from store and able to update
Expand Down Expand Up @@ -228,7 +228,7 @@ describe("QdmRiskAdjustment Component", () => {
description: "",
},
{
definition: 'SDE."SDE Ethnicity"',
definition: '"SDE Ethnicity"',
description: "",
},
];
Expand Down Expand Up @@ -258,10 +258,10 @@ describe("QdmRiskAdjustment Component", () => {

userEvent.click(riskAdjustmentButton);
await waitFor(() => {
userEvent.click(screen.getByText('SDE."SDE Ethnicity"'));
userEvent.click(screen.getByText('"SDE Ethnicity"'));
});
expect(
screen.getByRole("button", { name: 'SDE."SDE Ethnicity"' })
screen.getByRole("button", { name: '"SDE Ethnicity"' })
).toBeInTheDocument();

// Verifies if RA description already loads values from store and able to update
Expand Down Expand Up @@ -358,11 +358,11 @@ describe("QdmRiskAdjustment Component", () => {

userEvent.click(riskAdjustmentButton);
await waitFor(() => {
userEvent.click(screen.getByText('SDE."SDE Ethnicity"'));
userEvent.click(screen.getByText('"SDE Ethnicity"'));
});
userEvent.click(riskAdjustmentButton); // To collapse the dropdown
expect(
screen.getByRole("button", { name: 'SDE."SDE Ethnicity"' })
screen.getByRole("button", { name: '"SDE Ethnicity"' })
).toBeInTheDocument();

// Verifies if RA description already loads values from store and able to update
Expand Down Expand Up @@ -411,11 +411,11 @@ describe("QdmRiskAdjustment Component", () => {

userEvent.click(riskAdjustmentButton);
await waitFor(() => {
userEvent.click(screen.getByText('SDE."SDE Ethnicity"'));
userEvent.click(screen.getByText('"SDE Ethnicity"'));
});
userEvent.click(riskAdjustmentButton); // To collapse the dropdown
expect(
screen.getByRole("button", { name: 'SDE."SDE Ethnicity"' })
screen.getByRole("button", { name: '"SDE Ethnicity"' })
).toBeInTheDocument();

// Verifies if RA description already loads values from store and able to update
Expand Down Expand Up @@ -471,17 +471,17 @@ describe("QdmRiskAdjustment Component", () => {

userEvent.click(riskAdjustmentButton);
await waitFor(() => {
userEvent.click(screen.getByText('SDE."SDE Ethnicity"'));
userEvent.click(screen.getByText('"SDE Ethnicity"'));
});
expect(
screen.getByRole("button", { name: 'SDE."SDE Ethnicity"' })
screen.getByRole("button", { name: '"SDE Ethnicity"' })
).toBeInTheDocument();

act(async () => {
const deleteButton = await screen.findByTestId("CancelIcon");
userEvent.click(deleteButton);
expect(
screen.queryByRole("button", { name: 'SDE."SDE Ethnicity"' })
screen.queryByRole("button", { name: '"SDE Ethnicity"' })
).not.toBeInTheDocument();
});
});
Expand Down
26 changes: 13 additions & 13 deletions src/components/editMeasure/populationCriteria/riskAdjustment/qiCore/RiskAdjustment.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ describe("QiCore RiskAdjustment Component", () => {
includeInReportType: ["Individual"],
},
{
definition: 'SDE."SDE Ethnicity"',
definition: '"SDE Ethnicity"',
description: "",
includeInReportType: [
"Individual",
Expand Down Expand Up @@ -204,10 +204,10 @@ describe("QiCore RiskAdjustment Component", () => {

userEvent.click(riskAdjustmentButton);
await waitFor(() => {
userEvent.click(screen.getByText('SDE."SDE Ethnicity"'));
userEvent.click(screen.getByText('"SDE Ethnicity"'));
});
expect(
screen.getByRole("button", { name: 'SDE."SDE Ethnicity"' })
screen.getByRole("button", { name: '"SDE Ethnicity"' })
).toBeInTheDocument();

// Verifies if RA description already loads values from store and able to update
Expand Down Expand Up @@ -255,7 +255,7 @@ describe("QiCore RiskAdjustment Component", () => {
description: "",
},
{
definition: 'SDE."SDE Ethnicity"',
definition: '"SDE Ethnicity"',
description: "",
includeInReportType: [
"Individual",
Expand Down Expand Up @@ -291,10 +291,10 @@ describe("QiCore RiskAdjustment Component", () => {

userEvent.click(riskAdjustmentButton);
await waitFor(() => {
userEvent.click(screen.getByText('SDE."SDE Ethnicity"'));
userEvent.click(screen.getByText('"SDE Ethnicity"'));
});
expect(
screen.getByRole("button", { name: 'SDE."SDE Ethnicity"' })
screen.getByRole("button", { name: '"SDE Ethnicity"' })
).toBeInTheDocument();

// Verifies if RA description already loads values from store and able to update
Expand Down Expand Up @@ -391,11 +391,11 @@ describe("QiCore RiskAdjustment Component", () => {

userEvent.click(riskAdjustmentButton);
await waitFor(() => {
userEvent.click(screen.getByText('SDE."SDE Ethnicity"'));
userEvent.click(screen.getByText('"SDE Ethnicity"'));
});
userEvent.click(riskAdjustmentButton); // To collapse the dropdown
expect(
screen.getByRole("button", { name: 'SDE."SDE Ethnicity"' })
screen.getByRole("button", { name: '"SDE Ethnicity"' })
).toBeInTheDocument();

// Verifies if RA description already loads values from store and able to update
Expand Down Expand Up @@ -444,11 +444,11 @@ describe("QiCore RiskAdjustment Component", () => {

userEvent.click(riskAdjustmentButton);
await waitFor(() => {
userEvent.click(screen.getByText('SDE."SDE Ethnicity"'));
userEvent.click(screen.getByText('"SDE Ethnicity"'));
});
userEvent.click(riskAdjustmentButton); // To collapse the dropdown
expect(
screen.getByRole("button", { name: 'SDE."SDE Ethnicity"' })
screen.getByRole("button", { name: '"SDE Ethnicity"' })
).toBeInTheDocument();

// Verifies if RA description already loads values from store and able to update
Expand Down Expand Up @@ -504,17 +504,17 @@ describe("QiCore RiskAdjustment Component", () => {

userEvent.click(riskAdjustmentButton);
await waitFor(() => {
userEvent.click(screen.getByText('SDE."SDE Ethnicity"'));
userEvent.click(screen.getByText('"SDE Ethnicity"'));
});
expect(
screen.getByRole("button", { name: 'SDE."SDE Ethnicity"' })
screen.getByRole("button", { name: '"SDE Ethnicity"' })
).toBeInTheDocument();

act(async () => {
const deleteButton = await screen.findByTestId("CancelIcon");
userEvent.click(deleteButton);
expect(
screen.queryByRole("button", { name: 'SDE."SDE Ethnicity"' })
screen.queryByRole("button", { name: '"SDE Ethnicity"' })
).not.toBeInTheDocument();
});
});
Expand Down
16 changes: 7 additions & 9 deletions ...mponents/editMeasure/populationCriteria/supplementalData/qiCore/SupplementalData.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ describe("SupplementalData Component QI-Core", () => {
includeInReportType: ["Individual"],
},
{
definition: 'SDE."SDE Ethnicity"',
definition: '"SDE Ethnicity"',
description: "",
includeInReportType: [
"Individual",
Expand Down Expand Up @@ -215,11 +215,11 @@ describe("SupplementalData Component QI-Core", () => {
userEvent.click(el);
});
expect(
screen.getByRole("button", { name: 'SDE."SDE Ethnicity"', exact: false })
screen.getByRole("button", { name: '"SDE Ethnicity"', exact: false })
).toBeInTheDocument();

const sdeEthnicityIncludeInReportTypeContainer = await screen.getByTestId(
'SDE."SDE Ethnicity"-include-in-report-type-dropdown',
'"SDE Ethnicity"-include-in-report-type-dropdown',
{ exact: true }
);
// check that it defaults to all values added for Include in Report Type
Expand Down Expand Up @@ -346,13 +346,11 @@ describe("SupplementalData Component QI-Core", () => {

userEvent.click(supplementalDataButton);
await waitFor(() => {
userEvent.click(
screen.getByText('SDE."SDE Ethnicity"', { exact: false })
);
userEvent.click(screen.getByText('"SDE Ethnicity"', { exact: false }));
});
userEvent.click(supplementalDataButton); // To collapse the dropdown
expect(
screen.getByRole("button", { name: 'SDE."SDE Ethnicity"', exact: false })
screen.getByRole("button", { name: '"SDE Ethnicity"', exact: false })
).toBeInTheDocument();

// Verifies if SD description already loads values from store and able to update
Expand Down Expand Up @@ -417,11 +415,11 @@ describe("SupplementalData Component QI-Core", () => {

userEvent.click(supplementalDataButton);
await waitFor(() => {
userEvent.click(screen.getByText('SDE."SDE Ethnicity"'));
userEvent.click(screen.getByText('"SDE Ethnicity"'));
});
userEvent.click(supplementalDataButton); // To collapse the dropdown
expect(
screen.getByRole("button", { name: 'SDE."SDE Ethnicity"' })
screen.getByRole("button", { name: '"SDE Ethnicity"' })
).toBeInTheDocument();

// Verifies if SD description already loads values from store and able to update
Expand Down

0 comments on commit 7a4a149

Please sign in to comment.