From 58ba4857f9a9f5687a16b46c30d692a371b4b620 Mon Sep 17 00:00:00 2001 From: Roland Osborne Date: Thu, 7 Mar 2024 16:43:36 -0800 Subject: [PATCH] fix jest errors --- net/web/src/context/useSettingsContext.hook.js | 6 +++++- net/web/test/Access.test.js | 6 +++--- net/web/test/App.test.js | 6 +++--- net/web/test/Contacts.test.js | 6 +++--- net/web/test/Info.test.js | 6 +++--- net/web/test/Listing.test.js | 6 +++--- net/web/test/Person.test.js | 8 ++++---- net/web/test/Session.test.js | 6 +++--- net/web/test/Thread.test.js | 6 +++--- net/web/test/Topics.test.js | 6 +++--- net/web/test/User.test.js | 6 +++--- net/web/test/Viewport.test.js | 16 ++++++++-------- 12 files changed, 44 insertions(+), 40 deletions(-) diff --git a/net/web/src/context/useSettingsContext.hook.js b/net/web/src/context/useSettingsContext.hook.js index 4aa8fa44..14710a18 100644 --- a/net/web/src/context/useSettingsContext.hook.js +++ b/net/web/src/context/useSettingsContext.hook.js @@ -48,6 +48,10 @@ export function useSettingsContext() { }; const getDevices = async (type) => { + if (!navigator || !navigator.mediaDevices) { + return []; + } + const filtered = new Map(); const devices = await navigator.mediaDevices.enumerateDevices(); @@ -190,7 +194,7 @@ export function useSettingsContext() { } } }, - setLanguage: (code: string) => { + setLanguage: (code) => { if (code && code.startsWith('fr')) { localStorage.setItem('language', 'fr'); updateState({ language: 'fr', strings: fr, themes: [{ value: 'dark', label: fr.dark }, { value: 'light', label: fr.light }]}); diff --git a/net/web/test/Access.test.js b/net/web/test/Access.test.js index d15e4954..b539f730 100644 --- a/net/web/test/Access.test.js +++ b/net/web/test/Access.test.js @@ -8,7 +8,7 @@ import { ChannelContextProvider } from 'context/ChannelContext'; import { StoreContextProvider } from 'context/StoreContext'; import { RingContextProvider } from 'context/RingContext'; import { UploadContextProvider } from 'context/UploadContext'; -import { ViewportContextProvider } from 'context/ViewportContext'; +import { SettingsContextProvider } from 'context/SettingsContext'; import { useAccess } from 'access/useAccess.hook'; import * as fetchUtil from 'api/fetchUtil'; @@ -36,11 +36,11 @@ function AccessTestApp() { - + - + diff --git a/net/web/test/App.test.js b/net/web/test/App.test.js index 11138635..1ab3c485 100644 --- a/net/web/test/App.test.js +++ b/net/web/test/App.test.js @@ -9,7 +9,7 @@ import { CardContextProvider } from 'context/CardContext'; import { ChannelContextProvider } from 'context/ChannelContext'; import { StoreContextProvider } from 'context/StoreContext'; import { UploadContextProvider } from 'context/UploadContext'; -import { ViewportContextProvider } from 'context/ViewportContext'; +import { SettingsContextProvider } from 'context/SettingsContext'; import { RingContextProvider } from 'context/RingContext'; import { ConversationContextProvider } from 'context/ConversationContext'; @@ -45,11 +45,11 @@ function AppTestApp() { - + - + diff --git a/net/web/test/Contacts.test.js b/net/web/test/Contacts.test.js index 6016a3b2..086ab143 100644 --- a/net/web/test/Contacts.test.js +++ b/net/web/test/Contacts.test.js @@ -7,7 +7,7 @@ import { CardContext, CardContextProvider } from 'context/CardContext'; import { ChannelContextProvider } from 'context/ChannelContext'; import { StoreContextProvider } from 'context/StoreContext'; import { UploadContextProvider } from 'context/UploadContext'; -import { ViewportContextProvider } from 'context/ViewportContext'; +import { SettingsContextProvider } from 'context/SettingsContext'; import { useCards } from 'session/cards/useCards.hook'; import * as fetchUtil from 'api/fetchUtil'; @@ -48,9 +48,9 @@ function ContactsTestApp() { - + - + diff --git a/net/web/test/Info.test.js b/net/web/test/Info.test.js index 38cbf494..2a208ba4 100644 --- a/net/web/test/Info.test.js +++ b/net/web/test/Info.test.js @@ -4,7 +4,7 @@ import { AppContextProvider } from 'context/AppContext'; import { AccountContextProvider } from 'context/AccountContext'; import { ProfileContext, ProfileContextProvider } from 'context/ProfileContext'; import { StoreContextProvider } from 'context/StoreContext'; -import { ViewportContextProvider } from 'context/ViewportContext'; +import { SettingsContextProvider } from 'context/SettingsContext'; import { ConversationContext, ConversationContextProvider } from 'context/ConversationContext'; import { CardContext, CardContextProvider } from 'context/CardContext'; import { UploadContextProvider } from 'context/UploadContext'; @@ -35,13 +35,13 @@ function InfoTestApp() { - + - + diff --git a/net/web/test/Listing.test.js b/net/web/test/Listing.test.js index a18b3de3..3c807a9a 100644 --- a/net/web/test/Listing.test.js +++ b/net/web/test/Listing.test.js @@ -1,7 +1,7 @@ import React, { useState, useEffect, useContext } from 'react'; import {render, act, screen, waitFor, fireEvent} from '@testing-library/react' import { ProfileContextProvider } from 'context/ProfileContext'; -import { ViewportContextProvider } from 'context/ViewportContext'; +import { SettingsContextProvider } from 'context/SettingsContext'; import { useListing } from 'session/listing/useListing.hook'; import * as fetchUtil from 'api/fetchUtil'; @@ -36,9 +36,9 @@ function ListingView() { function ListingTestApp() { return ( - + - + ); } diff --git a/net/web/test/Person.test.js b/net/web/test/Person.test.js index ecb5b8f9..546f1182 100644 --- a/net/web/test/Person.test.js +++ b/net/web/test/Person.test.js @@ -1,7 +1,7 @@ import React, { useState, useEffect, useContext } from 'react'; import {render, act, screen, waitFor, fireEvent} from '@testing-library/react' import { CardContext, CardContextProvider } from 'context/CardContext'; -import { ViewportContextProvider } from 'context/ViewportContext'; +import { SettingsContextProvider } from 'context/SettingsContext'; import { useContact } from 'session/contact/useContact.hook'; import * as fetchUtil from 'api/fetchUtil'; @@ -34,9 +34,9 @@ function ContactView() { function ContactTestApp() { return ( - + - + ); } @@ -188,7 +188,7 @@ test('update contact name', async () => { await waitFor(async () => { expect(screen.getByTestId('name').textContent).toBe('tested'); - expect(screen.getByTestId('status').textContent).toBe('saved'); + expect(screen.getByTestId('status').textContent).toBe('confirmed'); }); fetchCards = [{ diff --git a/net/web/test/Session.test.js b/net/web/test/Session.test.js index 7a6a6dab..0b1444b0 100644 --- a/net/web/test/Session.test.js +++ b/net/web/test/Session.test.js @@ -7,7 +7,7 @@ import { CardContext, CardContextProvider } from 'context/CardContext'; import { ChannelContextProvider } from 'context/ChannelContext'; import { StoreContext, StoreContextProvider } from 'context/StoreContext'; import { UploadContextProvider } from 'context/UploadContext'; -import { ViewportContextProvider } from 'context/ViewportContext'; +import { SettingsContextProvider } from 'context/SettingsContext'; import { RingContextProvider } from 'context/RingContext'; import { useSession } from 'session/useSession.hook'; import * as fetchUtil from 'api/fetchUtil'; @@ -39,11 +39,11 @@ function SessionTestApp() { - + - + diff --git a/net/web/test/Thread.test.js b/net/web/test/Thread.test.js index 6e31878e..5eada80c 100644 --- a/net/web/test/Thread.test.js +++ b/net/web/test/Thread.test.js @@ -4,7 +4,7 @@ import { AppContextProvider } from 'context/AppContext'; import { AccountContextProvider } from 'context/AccountContext'; import { ProfileContext, ProfileContextProvider } from 'context/ProfileContext'; import { StoreContextProvider } from 'context/StoreContext'; -import { ViewportContextProvider } from 'context/ViewportContext'; +import { SettingsContextProvider } from 'context/SettingsContext'; import { ConversationContextProvider } from 'context/ConversationContext'; import { CardContext, CardContextProvider } from 'context/CardContext'; import { UploadContextProvider } from 'context/UploadContext'; @@ -46,13 +46,13 @@ function ThreadTestApp() { - + - + diff --git a/net/web/test/Topics.test.js b/net/web/test/Topics.test.js index e14e97dc..d5e9b2dd 100644 --- a/net/web/test/Topics.test.js +++ b/net/web/test/Topics.test.js @@ -7,7 +7,7 @@ import { CardContext, CardContextProvider } from 'context/CardContext'; import { ChannelContext, ChannelContextProvider } from 'context/ChannelContext'; import { StoreContextProvider } from 'context/StoreContext'; import { UploadContextProvider } from 'context/UploadContext'; -import { ViewportContextProvider } from 'context/ViewportContext'; +import { SettingsContextProvider } from 'context/SettingsContext'; import { useChannels } from 'session/channels/useChannels.hook'; import * as fetchUtil from 'api/fetchUtil'; @@ -51,9 +51,9 @@ function TopicsTestApp() { - + - + diff --git a/net/web/test/User.test.js b/net/web/test/User.test.js index 4b482856..53a6ddf1 100644 --- a/net/web/test/User.test.js +++ b/net/web/test/User.test.js @@ -4,7 +4,7 @@ import { AppContextProvider } from 'context/AppContext'; import { AccountContextProvider } from 'context/AccountContext'; import { ProfileContext, ProfileContextProvider } from 'context/ProfileContext'; import { StoreContextProvider } from 'context/StoreContext'; -import { ViewportContextProvider } from 'context/ViewportContext'; +import { SettingsContextProvider } from 'context/SettingsContext'; import { useProfile } from 'session/account/profile/useProfile.hook'; import * as fetchUtil from 'api/fetchUtil'; @@ -35,11 +35,11 @@ function ProfileTestApp() { - + - + diff --git a/net/web/test/Viewport.test.js b/net/web/test/Viewport.test.js index 609588ef..eeeff61a 100644 --- a/net/web/test/Viewport.test.js +++ b/net/web/test/Viewport.test.js @@ -1,31 +1,31 @@ import React, { useState, useEffect, useContext } from 'react'; import {render, act, screen, waitFor, fireEvent} from '@testing-library/react' -import { ViewportContext, ViewportContextProvider } from 'context/ViewportContext'; +import { SettingsContext, SettingsContextProvider } from 'context/SettingsContext'; function ViewportView() { const [renderCount, setRenderCount] = useState(0); - const viewport = useContext(ViewportContext); + const settings = useContext(SettingsContext); useEffect(() => { setRenderCount(renderCount + 1); - }, [viewport.state]); + }, [settings.state]); return (
{ renderCount } - { viewport.state.display } - { viewport.state.width } - { viewport.state.height } + { settings.state.display } + { settings.state.width } + { settings.state.height }
); } function ViewportTestApp() { return ( - + - + ); }