Skip to content

Commit

Permalink
Fixed tests after upgrades
Browse files Browse the repository at this point in the history
  • Loading branch information
simensma-fresh committed Oct 23, 2024
1 parent 23a9194 commit 795a5b9
Show file tree
Hide file tree
Showing 15 changed files with 165 additions and 144 deletions.
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
"resolutions": {
"@types/react": "16.9.49",
"@types/react-dom": "16.9.8",
"@types/react-router-dom": "5.3.3"
"@types/react-router-dom": "5.3.3",
"cheerio": "1.0.0-rc.3"
},
"scripts": {
"postinstall": "husky install"
Expand Down
2 changes: 1 addition & 1 deletion services/common/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module.exports = {
"^.+\\.(t|j)sx?$": [
"ts-jest",
{
tsConfigFile: "./tsconfig.json",
tsconfig: "./tsconfig.json",
isolatedModules: true,
},
],
Expand Down
4 changes: 2 additions & 2 deletions services/common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"react-hot-loader": "4.12.21",
"sharp": "^0.33.3",
"style-loader": "4.0.0",
"ts-jest": "29.1.2",
"ts-jest": "29.2.5",
"typescript": "4.7.4",
"undici": "6.19.7",
"webpack": "5.95.0",
Expand All @@ -86,4 +86,4 @@
"jest-junit": {
"output": "./coverage/tests-report.xml"
}
}
}
2 changes: 1 addition & 1 deletion services/core-web/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module.exports = {
"^.+\\.(t|j)sx?$": [
"ts-jest",
{
tsConfigFile: "./tsconfig.json",
tsconfig: "./tsconfig.json",
isolatedModules: true,
},
],
Expand Down
6 changes: 3 additions & 3 deletions services/core-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
"cssnano": "7.0.6",
"cypress": "13.15.0",
"cypress-file-upload": "^5.0.8",
"enzyme-to-json": "3.3.5",
"enzyme-to-json": "3.6.2",
"esbuild-loader": "4.2.2",
"eslint": "9.13.0",
"eslint-config-airbnb": "19.0.4",
Expand Down Expand Up @@ -125,7 +125,7 @@
"speed-measure-webpack-plugin": "^1.5.0",
"style-loader": "4.0.0",
"thread-loader": "4.0.4",
"ts-jest": "29.1.2",
"ts-jest": "29.2.5",
"ts-node": "^10.9.1",
"tsconfig-paths-webpack-plugin": "^4.1.0",
"typescript": "4.7.4",
Expand Down Expand Up @@ -173,4 +173,4 @@
"browserslist": [
"> 0.1%"
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -82,29 +82,3 @@ export const RenderExtractionError: FC = () => (
</Col>
</Row>
);


export const RenderExtractionError: FC = () => (
<Row align="middle" justify="space-between" gutter={[10, 16]}>
<Col span={24}>
<Title className="margin-none" level={2}>
Permit Conditions
</Title>
</Col>
<Col span={24}>
<Row gutter={10} style={{ background: "#fff" }} justify={"center"}>
<div className="null-screen fade-in" style={{ maxWidth: "728px" }}>
<div>
<p className="margin-medium--bottom">
<FontAwesomeIcon icon={faCircleX} size="5x" color="red" />
</p>
<h3>Failed to extract permit conditions</h3>
<p>
We encountered an issue while extracting the permit conditions. Please try again. if the problem persists, check the file and ensure it meets the required format.
</p>
</div>
</div>
</Row>
</Col>
</Row>
);
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ exports[`MineRecordForm renders properly 1`] = `
hasFeedback={false}
label="Is this a historic mine status?"
>
<Memo([object Object])
<Memo(ForwardRef)
defaultValue={false}
onChange={[Function]}
value={false}
Expand All @@ -83,7 +83,7 @@ exports[`MineRecordForm renders properly 1`] = `
>
No
</Radio>
</Memo([object Object])>
</Memo(ForwardRef)>
</FormItem>
</Col>
</Row>
Expand Down Expand Up @@ -196,7 +196,7 @@ exports[`MineRecordForm renders properly 1`] = `
hasFeedback={false}
label="Does this mine site belong to a government agency?"
>
<Memo([object Object])
<Memo(ForwardRef)
defaultValue={false}
onChange={[Function]}
value={false}
Expand All @@ -211,7 +211,7 @@ exports[`MineRecordForm renders properly 1`] = `
>
No
</Radio>
</Memo([object Object])>
</Memo(ForwardRef)>
</FormItem>
</Col>
</Row>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ exports[`AddFullPartyForm renders properly 1`] = `
<div
className="center margin-large"
>
<Memo([object Object])
<Memo(ForwardRef)
defaultValue={true}
onChange={[MockFunction]}
size="large"
Expand All @@ -35,7 +35,7 @@ exports[`AddFullPartyForm renders properly 1`] = `
>
Organization
</ForwardRef(RadioButton)>
</Memo([object Object])>
</Memo(ForwardRef)>
</div>
<Row
gutter={16}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ exports[`AddVarianceForm renders properly 1`] = `
hasFeedback={false}
label="Are you creating an application or an approved variance?"
>
<Memo([object Object])
<Memo(ForwardRef)
onChange={[Function]}
value={true}
>
Expand All @@ -25,7 +25,7 @@ exports[`AddVarianceForm renders properly 1`] = `
>
Approved Variance
</Radio>
</Memo([object Object])>
</Memo(ForwardRef)>
</FormItem>
<FormItem
hasFeedback={false}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ exports[`FilePicker renders properly 1`] = `
<FormItem
hasFeedback={false}
>
<Memo([object Object])
<Memo(ForwardRef)
defaultValue={true}
onChange={[Function]}
size="large"
Expand All @@ -23,7 +23,7 @@ exports[`FilePicker renders properly 1`] = `
>
Attach existing file(s)
</ForwardRef(RadioButton)>
</Memo([object Object])>
</Memo(ForwardRef)>
</FormItem>
</div>
<FormItem
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ exports[`RenderRadioButtons renders properly 1`] = `
label=""
validateStatus=""
>
<Memo([object Object])
<Memo(ForwardRef)
disabled={false}
id="1"
onChange={[Function]}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ exports[`ModalWrapper renders properly 1`] = `
style="width: 150px;"
>
<div
aria-hidden="true"
style="width: 0px; height: 0px; overflow: hidden; outline: none;"
tabindex="0"
/>
Expand Down Expand Up @@ -114,7 +113,6 @@ exports[`ModalWrapper renders properly 1`] = `
</div>
</div>
<div
aria-hidden="true"
style="width: 0px; height: 0px; overflow: hidden; outline: none;"
tabindex="0"
/>
Expand Down
4 changes: 2 additions & 2 deletions services/minespace-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"core-js": "3.38.1",
"dotenv": "16.4.5",
"enzyme": "3.11.0",
"enzyme-to-json": "3.4.3",
"enzyme-to-json": "3.6.2",
"express": "4.19.2",
"express-cache-controller": "1.1.0",
"filepond": "4.30.4",
Expand Down Expand Up @@ -102,7 +102,7 @@
"speed-measure-webpack-plugin": "1.5.0",
"style-loader": "4.0.0",
"thread-loader": "4.0.4",
"ts-jest": "29.1.2",
"ts-jest": "29.2.5",
"ts-loader": "9.5.1",
"ts-node": "10.9.1",
"typescript": "4.7.4",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ exports[`ModalWrapper renders properly 1`] = `
style="width: 150px;"
>
<div
aria-hidden="true"
style="width: 0px; height: 0px; overflow: hidden; outline: none;"
tabindex="0"
/>
Expand Down Expand Up @@ -74,7 +73,6 @@ exports[`ModalWrapper renders properly 1`] = `
</div>
</div>
<div
aria-hidden="true"
style="width: 0px; height: 0px; overflow: hidden; outline: none;"
tabindex="0"
/>
Expand Down
Loading

0 comments on commit 795a5b9

Please sign in to comment.