fix jest errors

This commit is contained in:
Roland Osborne 2024-03-07 16:43:36 -08:00
parent 67f7caa378
commit 58ba4857f9
12 changed files with 44 additions and 40 deletions

View File

@ -48,6 +48,10 @@ export function useSettingsContext() {
}; };
const getDevices = async (type) => { const getDevices = async (type) => {
if (!navigator || !navigator.mediaDevices) {
return [];
}
const filtered = new Map(); const filtered = new Map();
const devices = await navigator.mediaDevices.enumerateDevices(); const devices = await navigator.mediaDevices.enumerateDevices();
@ -190,7 +194,7 @@ export function useSettingsContext() {
} }
} }
}, },
setLanguage: (code: string) => { setLanguage: (code) => {
if (code && code.startsWith('fr')) { if (code && code.startsWith('fr')) {
localStorage.setItem('language', 'fr'); localStorage.setItem('language', 'fr');
updateState({ language: 'fr', strings: fr, themes: [{ value: 'dark', label: fr.dark }, { value: 'light', label: fr.light }]}); updateState({ language: 'fr', strings: fr, themes: [{ value: 'dark', label: fr.dark }, { value: 'light', label: fr.light }]});

View File

@ -8,7 +8,7 @@ import { ChannelContextProvider } from 'context/ChannelContext';
import { StoreContextProvider } from 'context/StoreContext'; import { StoreContextProvider } from 'context/StoreContext';
import { RingContextProvider } from 'context/RingContext'; import { RingContextProvider } from 'context/RingContext';
import { UploadContextProvider } from 'context/UploadContext'; import { UploadContextProvider } from 'context/UploadContext';
import { ViewportContextProvider } from 'context/ViewportContext'; import { SettingsContextProvider } from 'context/SettingsContext';
import { useAccess } from 'access/useAccess.hook'; import { useAccess } from 'access/useAccess.hook';
import * as fetchUtil from 'api/fetchUtil'; import * as fetchUtil from 'api/fetchUtil';
@ -36,11 +36,11 @@ function AccessTestApp() {
<StoreContextProvider> <StoreContextProvider>
<AccountContextProvider> <AccountContextProvider>
<RingContextProvider> <RingContextProvider>
<ViewportContextProvider> <SettingsContextProvider>
<AppContextProvider> <AppContextProvider>
<AccessView /> <AccessView />
</AppContextProvider> </AppContextProvider>
</ViewportContextProvider> </SettingsContextProvider>
</RingContextProvider> </RingContextProvider>
</AccountContextProvider> </AccountContextProvider>
</StoreContextProvider> </StoreContextProvider>

View File

@ -9,7 +9,7 @@ import { CardContextProvider } from 'context/CardContext';
import { ChannelContextProvider } from 'context/ChannelContext'; import { ChannelContextProvider } from 'context/ChannelContext';
import { StoreContextProvider } from 'context/StoreContext'; import { StoreContextProvider } from 'context/StoreContext';
import { UploadContextProvider } from 'context/UploadContext'; import { UploadContextProvider } from 'context/UploadContext';
import { ViewportContextProvider } from 'context/ViewportContext'; import { SettingsContextProvider } from 'context/SettingsContext';
import { RingContextProvider } from 'context/RingContext'; import { RingContextProvider } from 'context/RingContext';
import { ConversationContextProvider } from 'context/ConversationContext'; import { ConversationContextProvider } from 'context/ConversationContext';
@ -45,11 +45,11 @@ function AppTestApp() {
<StoreContextProvider> <StoreContextProvider>
<AccountContextProvider> <AccountContextProvider>
<RingContextProvider> <RingContextProvider>
<ViewportContextProvider> <SettingsContextProvider>
<AppContextProvider> <AppContextProvider>
<AppView /> <AppView />
</AppContextProvider> </AppContextProvider>
</ViewportContextProvider> </SettingsContextProvider>
</RingContextProvider> </RingContextProvider>
</AccountContextProvider> </AccountContextProvider>
</StoreContextProvider> </StoreContextProvider>

View File

@ -7,7 +7,7 @@ import { CardContext, CardContextProvider } from 'context/CardContext';
import { ChannelContextProvider } from 'context/ChannelContext'; import { ChannelContextProvider } from 'context/ChannelContext';
import { StoreContextProvider } from 'context/StoreContext'; import { StoreContextProvider } from 'context/StoreContext';
import { UploadContextProvider } from 'context/UploadContext'; import { UploadContextProvider } from 'context/UploadContext';
import { ViewportContextProvider } from 'context/ViewportContext'; import { SettingsContextProvider } from 'context/SettingsContext';
import { useCards } from 'session/cards/useCards.hook'; import { useCards } from 'session/cards/useCards.hook';
import * as fetchUtil from 'api/fetchUtil'; import * as fetchUtil from 'api/fetchUtil';
@ -48,9 +48,9 @@ function ContactsTestApp() {
<ProfileContextProvider> <ProfileContextProvider>
<StoreContextProvider> <StoreContextProvider>
<AccountContextProvider> <AccountContextProvider>
<ViewportContextProvider> <SettingsContextProvider>
<ContactsView /> <ContactsView />
</ViewportContextProvider> </SettingsContextProvider>
</AccountContextProvider> </AccountContextProvider>
</StoreContextProvider> </StoreContextProvider>
</ProfileContextProvider> </ProfileContextProvider>

View File

@ -4,7 +4,7 @@ import { AppContextProvider } from 'context/AppContext';
import { AccountContextProvider } from 'context/AccountContext'; import { AccountContextProvider } from 'context/AccountContext';
import { ProfileContext, ProfileContextProvider } from 'context/ProfileContext'; import { ProfileContext, ProfileContextProvider } from 'context/ProfileContext';
import { StoreContextProvider } from 'context/StoreContext'; import { StoreContextProvider } from 'context/StoreContext';
import { ViewportContextProvider } from 'context/ViewportContext'; import { SettingsContextProvider } from 'context/SettingsContext';
import { ConversationContext, ConversationContextProvider } from 'context/ConversationContext'; import { ConversationContext, ConversationContextProvider } from 'context/ConversationContext';
import { CardContext, CardContextProvider } from 'context/CardContext'; import { CardContext, CardContextProvider } from 'context/CardContext';
import { UploadContextProvider } from 'context/UploadContext'; import { UploadContextProvider } from 'context/UploadContext';
@ -35,13 +35,13 @@ function InfoTestApp() {
<CardContextProvider> <CardContextProvider>
<ProfileContextProvider> <ProfileContextProvider>
<AccountContextProvider> <AccountContextProvider>
<ViewportContextProvider> <SettingsContextProvider>
<ConversationContextProvider> <ConversationContextProvider>
<AppContextProvider> <AppContextProvider>
<InfoView /> <InfoView />
</AppContextProvider> </AppContextProvider>
</ConversationContextProvider> </ConversationContextProvider>
</ViewportContextProvider> </SettingsContextProvider>
</AccountContextProvider> </AccountContextProvider>
</ProfileContextProvider> </ProfileContextProvider>
</CardContextProvider> </CardContextProvider>

View File

@ -1,7 +1,7 @@
import React, { useState, useEffect, useContext } from 'react'; import React, { useState, useEffect, useContext } from 'react';
import {render, act, screen, waitFor, fireEvent} from '@testing-library/react' import {render, act, screen, waitFor, fireEvent} from '@testing-library/react'
import { ProfileContextProvider } from 'context/ProfileContext'; import { ProfileContextProvider } from 'context/ProfileContext';
import { ViewportContextProvider } from 'context/ViewportContext'; import { SettingsContextProvider } from 'context/SettingsContext';
import { useListing } from 'session/listing/useListing.hook'; import { useListing } from 'session/listing/useListing.hook';
import * as fetchUtil from 'api/fetchUtil'; import * as fetchUtil from 'api/fetchUtil';
@ -36,9 +36,9 @@ function ListingView() {
function ListingTestApp() { function ListingTestApp() {
return ( return (
<ProfileContextProvider> <ProfileContextProvider>
<ViewportContextProvider> <SettingsContextProvider>
<ListingView /> <ListingView />
</ViewportContextProvider> </SettingsContextProvider>
</ProfileContextProvider> </ProfileContextProvider>
); );
} }

View File

@ -1,7 +1,7 @@
import React, { useState, useEffect, useContext } from 'react'; import React, { useState, useEffect, useContext } from 'react';
import {render, act, screen, waitFor, fireEvent} from '@testing-library/react' import {render, act, screen, waitFor, fireEvent} from '@testing-library/react'
import { CardContext, CardContextProvider } from 'context/CardContext'; import { CardContext, CardContextProvider } from 'context/CardContext';
import { ViewportContextProvider } from 'context/ViewportContext'; import { SettingsContextProvider } from 'context/SettingsContext';
import { useContact } from 'session/contact/useContact.hook'; import { useContact } from 'session/contact/useContact.hook';
import * as fetchUtil from 'api/fetchUtil'; import * as fetchUtil from 'api/fetchUtil';
@ -34,9 +34,9 @@ function ContactView() {
function ContactTestApp() { function ContactTestApp() {
return ( return (
<CardContextProvider> <CardContextProvider>
<ViewportContextProvider> <SettingsContextProvider>
<ContactView /> <ContactView />
</ViewportContextProvider> </SettingsContextProvider>
</CardContextProvider> </CardContextProvider>
); );
} }
@ -188,7 +188,7 @@ test('update contact name', async () => {
await waitFor(async () => { await waitFor(async () => {
expect(screen.getByTestId('name').textContent).toBe('tested'); expect(screen.getByTestId('name').textContent).toBe('tested');
expect(screen.getByTestId('status').textContent).toBe('saved'); expect(screen.getByTestId('status').textContent).toBe('confirmed');
}); });
fetchCards = [{ fetchCards = [{

View File

@ -7,7 +7,7 @@ import { CardContext, CardContextProvider } from 'context/CardContext';
import { ChannelContextProvider } from 'context/ChannelContext'; import { ChannelContextProvider } from 'context/ChannelContext';
import { StoreContext, StoreContextProvider } from 'context/StoreContext'; import { StoreContext, StoreContextProvider } from 'context/StoreContext';
import { UploadContextProvider } from 'context/UploadContext'; import { UploadContextProvider } from 'context/UploadContext';
import { ViewportContextProvider } from 'context/ViewportContext'; import { SettingsContextProvider } from 'context/SettingsContext';
import { RingContextProvider } from 'context/RingContext'; import { RingContextProvider } from 'context/RingContext';
import { useSession } from 'session/useSession.hook'; import { useSession } from 'session/useSession.hook';
import * as fetchUtil from 'api/fetchUtil'; import * as fetchUtil from 'api/fetchUtil';
@ -39,11 +39,11 @@ function SessionTestApp() {
<StoreContextProvider> <StoreContextProvider>
<AccountContextProvider> <AccountContextProvider>
<RingContextProvider> <RingContextProvider>
<ViewportContextProvider> <SettingsContextProvider>
<AppContextProvider> <AppContextProvider>
<SessionView /> <SessionView />
</AppContextProvider> </AppContextProvider>
</ViewportContextProvider> </SettingsContextProvider>
</RingContextProvider> </RingContextProvider>
</AccountContextProvider> </AccountContextProvider>
</StoreContextProvider> </StoreContextProvider>

View File

@ -4,7 +4,7 @@ import { AppContextProvider } from 'context/AppContext';
import { AccountContextProvider } from 'context/AccountContext'; import { AccountContextProvider } from 'context/AccountContext';
import { ProfileContext, ProfileContextProvider } from 'context/ProfileContext'; import { ProfileContext, ProfileContextProvider } from 'context/ProfileContext';
import { StoreContextProvider } from 'context/StoreContext'; import { StoreContextProvider } from 'context/StoreContext';
import { ViewportContextProvider } from 'context/ViewportContext'; import { SettingsContextProvider } from 'context/SettingsContext';
import { ConversationContextProvider } from 'context/ConversationContext'; import { ConversationContextProvider } from 'context/ConversationContext';
import { CardContext, CardContextProvider } from 'context/CardContext'; import { CardContext, CardContextProvider } from 'context/CardContext';
import { UploadContextProvider } from 'context/UploadContext'; import { UploadContextProvider } from 'context/UploadContext';
@ -46,13 +46,13 @@ function ThreadTestApp() {
<CardContextProvider> <CardContextProvider>
<ProfileContextProvider> <ProfileContextProvider>
<AccountContextProvider> <AccountContextProvider>
<ViewportContextProvider> <SettingsContextProvider>
<ConversationContextProvider> <ConversationContextProvider>
<AppContextProvider> <AppContextProvider>
<ThreadView /> <ThreadView />
</AppContextProvider> </AppContextProvider>
</ConversationContextProvider> </ConversationContextProvider>
</ViewportContextProvider> </SettingsContextProvider>
</AccountContextProvider> </AccountContextProvider>
</ProfileContextProvider> </ProfileContextProvider>
</CardContextProvider> </CardContextProvider>

View File

@ -7,7 +7,7 @@ import { CardContext, CardContextProvider } from 'context/CardContext';
import { ChannelContext, ChannelContextProvider } from 'context/ChannelContext'; import { ChannelContext, ChannelContextProvider } from 'context/ChannelContext';
import { StoreContextProvider } from 'context/StoreContext'; import { StoreContextProvider } from 'context/StoreContext';
import { UploadContextProvider } from 'context/UploadContext'; import { UploadContextProvider } from 'context/UploadContext';
import { ViewportContextProvider } from 'context/ViewportContext'; import { SettingsContextProvider } from 'context/SettingsContext';
import { useChannels } from 'session/channels/useChannels.hook'; import { useChannels } from 'session/channels/useChannels.hook';
import * as fetchUtil from 'api/fetchUtil'; import * as fetchUtil from 'api/fetchUtil';
@ -51,9 +51,9 @@ function TopicsTestApp() {
<ProfileContextProvider> <ProfileContextProvider>
<StoreContextProvider> <StoreContextProvider>
<AccountContextProvider> <AccountContextProvider>
<ViewportContextProvider> <SettingsContextProvider>
<TopicsView /> <TopicsView />
</ViewportContextProvider> </SettingsContextProvider>
</AccountContextProvider> </AccountContextProvider>
</StoreContextProvider> </StoreContextProvider>
</ProfileContextProvider> </ProfileContextProvider>

View File

@ -4,7 +4,7 @@ import { AppContextProvider } from 'context/AppContext';
import { AccountContextProvider } from 'context/AccountContext'; import { AccountContextProvider } from 'context/AccountContext';
import { ProfileContext, ProfileContextProvider } from 'context/ProfileContext'; import { ProfileContext, ProfileContextProvider } from 'context/ProfileContext';
import { StoreContextProvider } from 'context/StoreContext'; import { StoreContextProvider } from 'context/StoreContext';
import { ViewportContextProvider } from 'context/ViewportContext'; import { SettingsContextProvider } from 'context/SettingsContext';
import { useProfile } from 'session/account/profile/useProfile.hook'; import { useProfile } from 'session/account/profile/useProfile.hook';
import * as fetchUtil from 'api/fetchUtil'; import * as fetchUtil from 'api/fetchUtil';
@ -35,11 +35,11 @@ function ProfileTestApp() {
<StoreContextProvider> <StoreContextProvider>
<ProfileContextProvider> <ProfileContextProvider>
<AccountContextProvider> <AccountContextProvider>
<ViewportContextProvider> <SettingsContextProvider>
<AppContextProvider> <AppContextProvider>
<ProfileView /> <ProfileView />
</AppContextProvider> </AppContextProvider>
</ViewportContextProvider> </SettingsContextProvider>
</AccountContextProvider> </AccountContextProvider>
</ProfileContextProvider> </ProfileContextProvider>
</StoreContextProvider> </StoreContextProvider>

View File

@ -1,31 +1,31 @@
import React, { useState, useEffect, useContext } from 'react'; import React, { useState, useEffect, useContext } from 'react';
import {render, act, screen, waitFor, fireEvent} from '@testing-library/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() { function ViewportView() {
const [renderCount, setRenderCount] = useState(0); const [renderCount, setRenderCount] = useState(0);
const viewport = useContext(ViewportContext); const settings = useContext(SettingsContext);
useEffect(() => { useEffect(() => {
setRenderCount(renderCount + 1); setRenderCount(renderCount + 1);
}, [viewport.state]); }, [settings.state]);
return ( return (
<div> <div>
<span data-testid="count">{ renderCount }</span> <span data-testid="count">{ renderCount }</span>
<span data-testid="display">{ viewport.state.display }</span> <span data-testid="display">{ settings.state.display }</span>
<span data-testid="width">{ viewport.state.width }</span> <span data-testid="width">{ settings.state.width }</span>
<span data-testid="height">{ viewport.state.height }</span> <span data-testid="height">{ settings.state.height }</span>
</div> </div>
); );
} }
function ViewportTestApp() { function ViewportTestApp() {
return ( return (
<ViewportContextProvider> <SettingsContextProvider>
<ViewportView /> <ViewportView />
</ViewportContextProvider> </SettingsContextProvider>
); );
} }