martin/databag
1
0
Fork 0
mirror of https://github.com/balzack/databag.git synced 2025-02-12 03:29:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

more app context cleanup

Browse Source
This commit is contained in:
Roland Osborne 2023-02-10 12:12:08 -08:00
parent c511f844ba
commit 6c2d1b225d
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/mobile/src/context/useAppContext.hook.js
View File

@ -17,7 +17,6 @@ export function useAppContext() {
const [state, setState] = useState({ const [state, setState] = useState({
session: null, session: null,
status: 'disconnected', status: 'disconnected',
first: true,
loggingOut: false, loggingOut: false,
adminToken: null, adminToken: null,
version: getVersion(), version: getVersion(),
@ -53,7 +52,7 @@ export function useAppContext() {
}, []); }, []);
const setSession = async () => { const setSession = async () => {
updateState({ session: true }); updateState({ session: true, status: 'connecting' });
await account.actions.setSession(access.current); await account.actions.setSession(access.current);
await profile.actions.setSession(access.current); await profile.actions.setSession(access.current);
await card.actions.setSession(access.current); await card.actions.setSession(access.current);
@ -153,7 +152,7 @@ export function useAppContext() {
try { try {
delay.current = 0; delay.current = 0;
const rev = JSON.parse(ev.data); const rev = JSON.parse(ev.data);
updateState({ first: false, status: 'connected' }); updateState({ status: 'connected' });
profile.actions.setRevision(rev.profile); profile.actions.setRevision(rev.profile);
account.actions.setRevision(rev.account); account.actions.setRevision(rev.account);
channel.actions.setRevision(rev.channel); channel.actions.setRevision(rev.channel);

7
app/mobile/test/App.test.js
View File

@ -78,6 +78,11 @@ beforeEach(() => {
React.useContext = mockUseContext; React.useContext = mockUseContext;
const mockFetch = jest.fn().mockImplementation((url, options) => { const mockFetch = jest.fn().mockImplementation((url, options) => {
if (url.startsWith('https://test.org/account/apps')) {
return Promise.resolve({
json: () => Promise.resolve({ guid: '123', appToken: 'abc' })
});
}
return Promise.resolve({ return Promise.resolve({
json: () => Promise.resolve([]) json: () => Promise.resolve([])
}); });
@ -103,7 +108,7 @@ test('testing', async () => {
await act(async () => { await act(async () => {
const app = screen.getByTestId('app').props.app; const app = screen.getByTestId('app').props.app;
app.actions.login('testlogin', 'testpassword'); app.actions.login('testlogin@test.org', 'testpassword');
}); });
await waitFor(async () => { await waitFor(async () => {