chore: update @types/luxon and fix ui tests

votingworks · Mar 20, 2023 · 98bbd86 · 98bbd86
1 parent a368f66
commit 98bbd86
Show file tree

Hide file tree

Showing 11 changed files with 56 additions and 66 deletions.
diff --git a/apps/central-scan/backend/package.json b/apps/central-scan/backend/package.json
@@ -82,7 +82,7 @@
     "@types/express": "^4.17.14",
     "@types/fs-extra": "^9.0.6",
     "@types/jest": "^26.0.6",
-    "@types/luxon": "^1.26.5",
+    "@types/luxon": "^3.0.0",
     "@types/multer": "^1.4.7",
     "@types/node": "16.11.29",
     "@types/supertest": "^2.0.10",

diff --git a/apps/mark/frontend/package.json b/apps/mark/frontend/package.json
@@ -132,7 +132,7 @@
     "@types/debug": "^4.1.6",
     "@types/history": "^4.7.8",
     "@types/kiosk-browser": "workspace:*",
-    "@types/luxon": "^1.26.2",
+    "@types/luxon": "^3.0.0",
     "@types/react-gamepad": "^1.0.0",
     "@types/setimmediate": "^1.0.2",
     "@types/testing-library__jest-dom": "^5.14.3",

diff --git a/apps/scan/backend/package.json b/apps/scan/backend/package.json
@@ -79,7 +79,7 @@
     "@types/express": "^4.17.13",
     "@types/fs-extra": "^9.0.6",
     "@types/jest": "^26.0.6",
-    "@types/luxon": "^1.26.5",
+    "@types/luxon": "^3.0.0",
     "@types/multer": "^1.4.7",
     "@types/node": "16.11.29",
     "@types/supertest": "^2.0.10",

diff --git a/libs/ballot-interpreter-nh/package.json b/libs/ballot-interpreter-nh/package.json
@@ -43,7 +43,7 @@
     "@types/he": "^1.1.2",
     "@types/jest": "^27.4.0",
     "@types/jsdom": "^20.0.0",
-    "@types/luxon": "^2.0.9",
+    "@types/luxon": "^3.0.0",
     "@types/tmp": "^0.2.3",
     "@typescript-eslint/eslint-plugin": "^5.37.0",
     "@typescript-eslint/parser": "^5.37.0",

diff --git a/libs/test-utils/package.json b/libs/test-utils/package.json
@@ -49,7 +49,7 @@
   "devDependencies": {
     "@types/jest": "^27.0.3",
     "@types/kiosk-browser": "workspace:*",
-    "@types/luxon": "^1.26.5",
+    "@types/luxon": "^3.0.0",
     "@types/react": "17.0.39",
     "@types/zip-stream": "workspace:*",
     "@typescript-eslint/eslint-plugin": "^5.37.0",

diff --git a/libs/types/package.json b/libs/types/package.json
@@ -47,7 +47,7 @@
   "devDependencies": {
     "@types/jest": "^27.0.3",
     "@types/kiosk-browser": "workspace:*",
-    "@types/luxon": "^2.3.2",
+    "@types/luxon": "^3.0.0",
     "@types/node": "16.11.29",
     "@types/react": "17.0.39",
     "@typescript-eslint/eslint-plugin": "^5.37.0",

diff --git a/libs/ui/package.json b/libs/ui/package.json
@@ -80,7 +80,7 @@
     "@types/history": "4",
     "@types/jest": "^27.0.3",
     "@types/kiosk-browser": "workspace:*",
-    "@types/luxon": "^1.26.5",
+    "@types/luxon": "^3.0.0",
     "@types/node": "16.11.29",
     "@types/pluralize": "^0.0.29",
     "@types/react": "17.0.39",

diff --git a/libs/ui/src/set_clock.test.tsx b/libs/ui/src/set_clock.test.tsx
@@ -23,15 +23,17 @@ function getSelect(testId: string): HTMLSelectElement {
   return screen.getByTestId(testId);
 }
 
-const aDate = DateTime.fromObject({
-  year: 2021,
-  month: 3,
-  day: 31,
-  hour: 19,
-  minute: 34,
-  second: 56,
-  zone: 'America/Los_Angeles',
-});
+const aDate = DateTime.fromObject(
+  {
+    year: 2021,
+    month: 3,
+    day: 31,
+    hour: 19,
+    minute: 34,
+    second: 56,
+  },
+  { zone: 'America/Los_Angeles' }
+);
 
 describe('PickDateTimeModal', () => {
   test('shows pickers for the datetime parts of the given time', () => {
@@ -141,15 +143,17 @@ describe('PickDateTimeModal', () => {
     // Expect a changed timezone
     expect(onSave).toHaveBeenNthCalledWith(
       3,
-      DateTime.fromObject({
-        year: aDate.year,
-        month: aDate.month,
-        day: changedDay,
-        hour: aDate.hour,
-        minute: aDate.minute,
-        second: 0,
-        zone: 'America/Chicago',
-      })
+      DateTime.fromObject(
+        {
+          year: aDate.year,
+          month: aDate.month,
+          day: changedDay,
+          hour: aDate.hour,
+          minute: aDate.minute,
+          second: 0,
+        },
+        { zone: 'America/Chicago' }
+      )
     );
   });
 

diff --git a/libs/ui/src/tally_report_metadata.test.tsx b/libs/ui/src/tally_report_metadata.test.tsx
@@ -25,6 +25,6 @@ test('Renders report metadata', () => {
   getByText(/Choctaw County/);
   getByText(/State of Mississippi/);
   getByText(
-    /This report was created on Tuesday, November 3, 2020 at 10:22:00 PM UTC/
+    /This report was created on Tuesday, November 3, 2020, 10:22:00 PM UTC/
   );
 });
diff --git a/libs/utils/package.json b/libs/utils/package.json
@@ -56,7 +56,7 @@
     "@types/fast-text-encoding": "^1.0.1",
     "@types/jest": "^27.0.3",
     "@types/kiosk-browser": "workspace:*",
-    "@types/luxon": "^1.26.5",
+    "@types/luxon": "^3.0.0",
     "@types/randombytes": "^2.0.0",
     "@types/yargs": "^17.0.12",
     "@typescript-eslint/eslint-plugin": "^5.37.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml