Fixed last failing tests for messages

gotify · Jan 2, 2025 · 39bd224 · 39bd224
1 parent 89529a9
commit 39bd224
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/ui/src/layout/Navigation.tsx b/ui/src/layout/Navigation.tsx
@@ -88,6 +88,8 @@ const Navigation = () => {
             <ListItemText primary="A Raspberry PI" />
         </ListItemButton>,
     ];
+
+    // TODO: on mobile (size maybe md or xs) the app list on left should be hidden by default
     return (
         <ResponsiveDrawer
             classes={{root: classes.root, paper: classes.drawerPaper}}

diff --git a/ui/src/store/auth-actions.ts b/ui/src/store/auth-actions.ts
@@ -150,7 +150,6 @@ export const logout = () => {
 export const changePassword = (pass: string) => {
     return async (dispatch: AppDispatch) => {
         await axios.post(config.get('url') + 'current/user/password', {pass});
-        // TODO: this post can fail, maybe add error handling?
         dispatch(uiActions.addSnackMessage('Password changed.'));
     };
 };

diff --git a/ui/src/store/message-actions.ts b/ui/src/store/message-actions.ts
@@ -19,7 +19,7 @@ export const fetchMessages = (appId: number = AllMessages, since: number = 0) =>
             const response = await axios.get(url);
             return response.data;
         };
-
+        dispatch(messageActions.loading(true));
         let url;
         if (appId === AllMessages) {
             url = config.get('url') + 'message?since=' + since;

diff --git a/ui/src/store/message-slice.ts b/ui/src/store/message-slice.ts
@@ -6,15 +6,13 @@ interface MessagesState {
     hasMore: boolean;
     nextSince: number;
     loaded: boolean;
-    isLoading: boolean;
 }
 
 const initialMessageState: MessagesState = {
     items: [],
     hasMore: false,
     nextSince: 0,
     loaded: false,
-    isLoading: false,
 }
 
 export const messageSlice = createSlice({
@@ -38,6 +36,9 @@ export const messageSlice = createSlice({
         },
         clear(state) {
             state.items = [];
+        },
+        loading(state, action: PayloadAction<boolean>) {
+            state.loaded = !action.payload;
         }
     }
 });

diff --git a/ui/src/tests/message.test.ts b/ui/src/tests/message.test.ts
@@ -5,7 +5,7 @@ import {newTest, GotifyTest} from './setup';
 import {clickByText, count, innerText, waitForCount, waitForExists} from './utils';
 import * as auth from './authentication';
 import * as selector from './selector';
-import axios from 'axios';
+import axios, {AxiosRequestConfig} from 'axios';
 import {IApplication, IMessage, IMessageExtras} from '../types';
 
 let page: Page;
@@ -18,7 +18,7 @@ beforeAll(async () => {
 afterAll(async () => await gotify.close());
 
 // eslint-disable-next-line
-const axiosAuth = {auth: {username: 'admin', password: 'admin'}};
+const axiosAuth: AxiosRequestConfig = {auth: {username: 'admin', password: 'admin'}};
 
 let windowsServerToken: string;
 let linuxServerToken: string;
@@ -47,7 +47,7 @@ describe.sequential('Messages', () => {
     });
     const createApp = (name: string) =>
         axios
-            .post<IApplication>(`${gotify.url}/application`, {name}, axiosAuth)
+            .post<IApplication>(`${gotify.url}application`, {name}, axiosAuth)
             .then((resp) => resp.data.token);
     it('shows navigation', async () => {
         await page.waitForSelector(naviId);
@@ -99,7 +99,7 @@ describe.sequential('Messages', () => {
         for (const item of messages) {
             const message = await innerText(item, '.content');
             const title = await innerText(item, '.title');
-            result.push({message, title});
+            result.push({title, message});
         }
         return result;
     };
@@ -122,7 +122,7 @@ describe.sequential('Messages', () => {
     const backup3 = m('Backup done', 'Gotify Backup finished (0.1MB).');
 
     const createMessage = (msg: Partial<IMessage>, token: string) =>
-        axios.post<IMessage>(`${gotify.url}/message`, msg, {
+        axios.post<IMessage>(`${gotify.url}message`, msg, {
             headers: {'X-Gotify-Key': token},
         });
 
@@ -156,7 +156,7 @@ describe.sequential('Messages', () => {
         expect(await extractMessages(0)).toEqual([]);
         await navigate('All Messages');
     });
-    describe('add some messages', () => {
+    describe.sequential('add some messages', () => {
         it('1', async () => {
             await createMessage(windows2, windowsServerToken);
             await expectMessages({
@@ -230,7 +230,7 @@ describe.sequential('Messages', () => {
             backup: [backup1],
         });
     });
-    describe('add some more messages', () => {
+    describe.sequential('add some more messages', () => {
         it('1', async () => {
             await createMessage(linux3, linuxServerToken);
             await expectMessages({