From 6d72ad4309045a2ce5b44349c30576befbc79218 Mon Sep 17 00:00:00 2001
From: Stephanie Freitag <stephanie.freitag@holi.team>
Date: Fri, 27 Sep 2024 14:07:37 +0200
Subject: [PATCH] NOISSUE: fix some typescript errors in tests
---
apps/web/__tests__/middleware.test.ts | 2 +-
.../__tests__/detectLocaleFromHeader.test.ts | 2 +-
.../__tests__/detectLocaleFromRequest.test.ts | 2 +-
.../errors/hooks/__tests__/useFieldErrors.test.ts | 2 ++
core/pagination/__tests__/testData.ts | 1 +
.../helpers/__tests__/defaultFilters.test.ts | 15 ++++++++-------
core/tracking/__tests__/useTracking.test.ts | 1 +
e2e/web/broken/spaces.spec.ts | 10 +++++-----
global.d.ts | 2 +-
packages/ui/package.json | 1 +
yarn.lock | 1 +
11 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/apps/web/__tests__/middleware.test.ts b/apps/web/__tests__/middleware.test.ts
index 2aefadcfef..e5967aff84 100644
--- a/apps/web/__tests__/middleware.test.ts
+++ b/apps/web/__tests__/middleware.test.ts
@@ -38,7 +38,7 @@ const createRequest = ({
get: () => acceptLanguage,
},
url,
- } as NextRequest
+ } as unknown as NextRequest
}
describe('middleware', () => {
diff --git a/apps/web/helpers/__tests__/detectLocaleFromHeader.test.ts b/apps/web/helpers/__tests__/detectLocaleFromHeader.test.ts
index d3c3af00d0..facc66410e 100644
--- a/apps/web/helpers/__tests__/detectLocaleFromHeader.test.ts
+++ b/apps/web/helpers/__tests__/detectLocaleFromHeader.test.ts
@@ -9,7 +9,7 @@ const createApiHeaders = (acceptLanguage = '') => ({
const createHeaders = (acceptLanguage = '') =>
({
get: () => acceptLanguage,
- } as NextRequest['headers'])
+ } as unknown as NextRequest['headers'])
describe('detectLocaleFromHeader', () => {
describe('api request', () => {
diff --git a/apps/web/helpers/__tests__/detectLocaleFromRequest.test.ts b/apps/web/helpers/__tests__/detectLocaleFromRequest.test.ts
index c816237b42..4300d534af 100644
--- a/apps/web/helpers/__tests__/detectLocaleFromRequest.test.ts
+++ b/apps/web/helpers/__tests__/detectLocaleFromRequest.test.ts
@@ -10,7 +10,7 @@ const createRequest = (acceptLanguage = '', locale?: string) =>
query: {
locale,
},
- } as NextApiRequest)
+ } as unknown as NextApiRequest)
describe('detectLocaleFromRequest', () => {
it('should use locale from query parameter', () => {
diff --git a/core/errors/hooks/__tests__/useFieldErrors.test.ts b/core/errors/hooks/__tests__/useFieldErrors.test.ts
index 6aa94844b0..072ce69068 100644
--- a/core/errors/hooks/__tests__/useFieldErrors.test.ts
+++ b/core/errors/hooks/__tests__/useFieldErrors.test.ts
@@ -32,6 +32,8 @@ const graphQlError: GraphQLError = {
originalError: undefined,
name: '',
message: '',
+ toJSON: jest.fn(),
+ [Symbol.toStringTag]: '',
}
describe('useFieldErrors', () => {
diff --git a/core/pagination/__tests__/testData.ts b/core/pagination/__tests__/testData.ts
index 1d3e339ac4..2e11449462 100644
--- a/core/pagination/__tests__/testData.ts
+++ b/core/pagination/__tests__/testData.ts
@@ -23,6 +23,7 @@ const insight: Insight = {
data: [],
},
isFavorite: false,
+ polls: [],
}
export const createInsightList = (length = 3) =>
diff --git a/core/screens/spaces/helpers/__tests__/defaultFilters.test.ts b/core/screens/spaces/helpers/__tests__/defaultFilters.test.ts
index 28973cad02..b780a4bf6d 100644
--- a/core/screens/spaces/helpers/__tests__/defaultFilters.test.ts
+++ b/core/screens/spaces/helpers/__tests__/defaultFilters.test.ts
@@ -1,12 +1,13 @@
+import { Topic } from '@holi/core/domain/shared/types'
import { getDefaultTopicIds } from '@holi/core/screens/spaces/helpers/defaultFilters'
-const topics = [
- { id: 'a', title: 'a', isDiscoverSpacesDefault: true },
- { id: 'b', title: 'b', isDiscoverSpacesDefault: true },
- { id: 'c', title: 'c', isDiscoverSpacesDefault: true },
- { id: 'd', title: 'd', isDiscoverSpacesDefault: false },
- { id: 'e', title: 'e', isDiscoverSpacesDefault: false },
- { id: 'f', title: 'f', isDiscoverSpacesDefault: false },
+const topics: Topic[] = [
+ { id: 'a', title: 'a', isDiscoverSpacesDefault: true, slug: 'a' },
+ { id: 'b', title: 'b', isDiscoverSpacesDefault: true, slug: 'b' },
+ { id: 'c', title: 'c', isDiscoverSpacesDefault: true, slug: 'c' },
+ { id: 'd', title: 'd', isDiscoverSpacesDefault: false, slug: 'd' },
+ { id: 'e', title: 'e', isDiscoverSpacesDefault: false, slug: 'e' },
+ { id: 'f', title: 'f', isDiscoverSpacesDefault: false, slug: 'f' },
]
describe('SpacesGrid', () => {
it('returns empty when default topic ids are the same as user topic ids', () => {
diff --git a/core/tracking/__tests__/useTracking.test.ts b/core/tracking/__tests__/useTracking.test.ts
index 1abff1aab7..f8d18b8273 100644
--- a/core/tracking/__tests__/useTracking.test.ts
+++ b/core/tracking/__tests__/useTracking.test.ts
@@ -21,6 +21,7 @@ const posthogCrossPlatformMock = {
reset: jest.fn(),
capture: jest.fn(),
identify: jest.fn(),
+ distinctId: jest.fn(),
} as PosthogCrossPlatform
const usePosthogCrossPlatformMock = usePosthogCrossPlatform as jest.Mock
diff --git a/e2e/web/broken/spaces.spec.ts b/e2e/web/broken/spaces.spec.ts
index d1e43b4389..86108e25e2 100644
--- a/e2e/web/broken/spaces.spec.ts
+++ b/e2e/web/broken/spaces.spec.ts
@@ -9,14 +9,14 @@ import {
proceedAsGuest,
waitForAnimationEnd,
withSSR,
-} from '../tests/helpers'
-import { inputSpaceNameAndGoal } from '../tests/helpers/spaces'
-import { SessionHandler, test } from '../tests/testmaster'
+} from '@holi/e2e-web/tests/helpers'
+import { inputSpaceNameAndGoal } from '@holi/e2e-web/tests/helpers/spaces'
+import { SessionHandler, test } from '@holi/e2e-web/tests/testmaster'
test.setTimeout(240000)
test.describe('@Spaces', () => {
- test('user journey', async ({ browser, browserName, context, page, sessions }) => {
+ test('user journey', async ({ browser, browserName, page, sessions }) => {
test.skip(
browserName === 'webkit',
'webkit fails regularly due to timing, race conditions, in a flaky way. Due to time constraints, we disabled the suite.'
@@ -39,7 +39,7 @@ test.describe('@Spaces', () => {
await withSSR(browser, page.url(), testDisplaysSpaceDetailsCommon)
await testShareSpace(browserName, page)
- await testCreatingEditingDeletingASpace(browser, context, page, sessions)
+ await testCreatingEditingDeletingASpace(browser, sessions)
})
})
diff --git a/global.d.ts b/global.d.ts
index 651a6dcd35..b9954d379b 100644
--- a/global.d.ts
+++ b/global.d.ts
@@ -6,7 +6,7 @@ import { HoliToastType } from '@holi/ui/components/molecules/HoliToastProvider'
declare global {
var mockNavigate: (routeName: string) => void
- var captureSentryException: (error: Error) => void
+ var captureSentryException: Mock<(error: Error) => void>
var mockSetOptions: (options: Partial<ScreenOptions>) => void
var mockOpenURL: (url: string) => void
var mockOpenToast: (text: string, type: HoliToastType, timeout: number, testID?: string) => void
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 4e0651e8e7..2fd07c0a06 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -18,6 +18,7 @@
"@babel/core": "^7.23.9",
"@babel/preset-env": "^7.23.9",
"@react-native-community/datetimepicker": "^8.2.0",
+ "@storybook/react": "^7.6.10",
"@types/tinycolor2": "1.4.3",
"lottie-react": "2.4.0",
"lottie-react-native": "6.7.0",
diff --git a/yarn.lock b/yarn.lock
index 0d6c8ca247..e413c85f28 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4436,6 +4436,7 @@ __metadata:
"@babel/preset-env": "npm:^7.23.9"
"@holi/icons": "npm:^1.0.0"
"@react-native-community/datetimepicker": "npm:^8.2.0"
+ "@storybook/react": "npm:^7.6.10"
"@types/tinycolor2": "npm:1.4.3"
lottie-react: "npm:2.4.0"
lottie-react-native: "npm:6.7.0"
--
GitLab