+ testApp = (
+
+ );
describe("ThemeProvider Component", () => {
-
it("should render", () => {
render(
- {testApp}
- );
-
- expect(getByText(buttonText)).toBeInTheDocument()
+ const { getByText } = render({testApp} );
+
+ expect(getByText(buttonText)).toBeInTheDocument();
});
-
+
it("should render with generic theme", () => {
- const {getByText} = render(
- {testApp}
- );
-
- expect(getByText(buttonText)).toBeInTheDocument()
+ const { getByText } = render(
+ {testApp} ,
+ );
+
+ expect(getByText(buttonText)).toBeInTheDocument();
});
-
+
it("should render with diamond theme", () => {
- const {getByText} = render(
- {testApp}
- );
-
- expect(getByText(buttonText)).toBeInTheDocument()
+ const { getByText } = render(
+ {testApp} ,
+ );
+
+ expect(getByText(buttonText)).toBeInTheDocument();
});
-
-
+
it("should render with a new theme", () => {
const NewTheme: Theme = createTheme({
...BaseThemeOptions,
- })
- const {getByText} = render(
- {testApp}
- );
-
- expect(getByText(buttonText)).toBeInTheDocument()
+ });
+ const { getByText } = render(
+ {testApp} ,
+ );
+ expect(getByText(buttonText)).toBeInTheDocument();
});
-})
+});
describe("ThemeProvider CssBaseline Component", () => {
-
it("should render with CssBaseline", () => {
- const {queryByTestId} = render();
- expect(queryByTestId("Mock_CssBaseline")).not.toBeInTheDocument()
- })
-
+ const { queryByTestId } = render(
- {testApp}
- );
-
- expect(getByText(buttonText)).toBeInTheDocument()
+ const { getByText } = render(
+ {testApp} ,
+ );
+
+ expect(getByText(buttonText)).toBeInTheDocument();
});
-})
\ No newline at end of file
+
+ it("should render with button but without CssBaseline", async () => {
+ const buttonText = "A button";
+ const { findByText } = render(
+
+
+ ,
+ );
+
+ expect(await findByText(buttonText));
+ });
+});
diff --git a/src/themes/ThemeProvider.tsx b/src/themes/ThemeProvider.tsx
index 5f2545d..d4328d3 100644
--- a/src/themes/ThemeProvider.tsx
+++ b/src/themes/ThemeProvider.tsx
@@ -1,28 +1,26 @@
-import * as React from "react";
-
import { ThemeProvider as Mui_ThemeProvider } from "@mui/material/styles";
-import {CssBaseline} from "@mui/material";
+import { CssBaseline } from "@mui/material";
import { GenericTheme } from "./GenericTheme";
-import {ThemeProviderProps as Mui_ThemeProviderProps} from "@mui/material/styles/ThemeProvider";
+import { ThemeProviderProps as Mui_ThemeProviderProps } from "@mui/material/styles/ThemeProvider";
interface ThemeProviderProps extends Partial {
- baseline?: boolean
+ baseline?: boolean;
}
const ThemeProvider = function ({
- children,
- theme = GenericTheme,
- baseline = true,
- defaultMode = "system",
- ...props
- }: ThemeProviderProps) {
+ children,
+ theme = GenericTheme,
+ baseline = true,
+ defaultMode = "system",
+ ...props
+}: ThemeProviderProps) {
return (
-
- {baseline &&
+
+ {baseline &&
);
};
export { ThemeProvider };
-export type { ThemeProviderProps };
\ No newline at end of file
+export type { ThemeProviderProps };
diff --git a/src/utils/diamond.test.ts b/src/utils/diamond.test.ts
index bb8ca36..1eb65a8 100644
--- a/src/utils/diamond.test.ts
+++ b/src/utils/diamond.test.ts
@@ -1,6 +1,5 @@
import { visitRegex, Visit, visitToText, regexToVisit } from "./diamond";
describe("visitRegex", () => {
-
const validStrings = ["ab123456-78", "xy1-99", "cd123-456", "fg456789-2"];
validStrings.forEach((str) => {
test(`should match valid string '${str}'`, () => {
@@ -27,12 +26,12 @@ describe("visitRegex", () => {
{ str: "ab12-34-56", name: "extra number" },
];
- invalidStrings.forEach(({ str, name }) => {
- test(`should not match invalid string '${str}' (${name})`, () => {
- const result = visitRegex.test(str);
- expect(result).toBe(false);
- });
+ invalidStrings.forEach(({ str, name }) => {
+ test(`should not match invalid string '${str}' (${name})`, () => {
+ const result = visitRegex.test(str);
+ expect(result).toBe(false);
});
+ });
test("should get three correct groups", () => {
const str = "ab12-34";
diff --git a/src/utils/diamond.ts b/src/utils/diamond.ts
index 409bb5b..a5d189e 100644
--- a/src/utils/diamond.ts
+++ b/src/utils/diamond.ts
@@ -7,22 +7,20 @@ interface Visit {
}
const visitToText = (visit?: Visit): string => {
- return(
- visit
- ? `${visit.proposalCode}${visit.proposalNumber.toFixed(
- 0
- )}-${visit.number.toFixed(0)}`
- : "")
-}
+ return visit
+ ? `${visit.proposalCode}${visit.proposalNumber.toFixed(
+ 0,
+ )}-${visit.number.toFixed(0)}`
+ : "";
+};
const regexToVisit = (parsedVisit: RegExpExecArray): Visit => {
- return ({
+ return {
proposalCode: parsedVisit[1],
proposalNumber: Number(parsedVisit[2]),
number: Number(parsedVisit[3]),
- })
-}
-
+ };
+};
export { regexToVisit, visitRegex, visitToText };
export type { Visit };
diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json
new file mode 100644
index 0000000..434adc6
--- /dev/null
+++ b/tsconfig.eslint.json
@@ -0,0 +1,10 @@
+{
+ "extends": "./tsconfig.json",
+ "include": [
+ "src",
+ "src/types",
+ ".storybook/**/*.tsx",
+ ".storybook/**/*.ts",
+ ".storybook/**/*.js",
+ ]
+}
diff --git a/tsconfig.json b/tsconfig.json
index 8f995ed..d561567 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -28,4 +28,4 @@
"src/types"
],
"rootDir": "src"
-}
+}
\ No newline at end of file
H1
Paragraph