Merge remote-tracking branch 'origin/master'

# Conflicts:
#	tests/ConfigProvider.test.js

tests/ConfigProvider.test.js

@@ -3,23 +3,30 @@ import { render, screen, act } from "@testing-library/react";
 import ConfigProvider from "../src/ConfigProvider";
 
 global.fetch = jest.fn(() =>
-    Promise.resolve({
+    new Promise((resolve) =>
-        ok: true,
+        setTimeout(() => {
-        json: () =>
+            resolve({
-            Promise.resolve({
+                ok: true,
-                BACKEND_HOST: "http://localhost:5000",
+                json: () =>
-                FRONTEND_HOST: "http://localhost:3000",
+                    Promise.resolve({
-            }),
+                        BACKEND_HOST: "http://localhost:5000",
-    })
+                        FRONTEND_HOST: "http://localhost:3000",
+                    }),
+            });
+        }, 100)
+    )
 );
 
 describe("ConfigProvider", () => {
-    it("should display loading initially", () => {
+    it("should display loading initially", async () => {
-        render(
+        await act(async () => {
-            <ConfigProvider>
+            render(
-                <div>Loaded</div>
+                <ConfigProvider>
-            </ConfigProvider>
+                    <div>Loaded</div>
-        );
+                </ConfigProvider>
+            );
+        });
+
         expect(screen.getByText(/Loading configuration/i)).toBeInTheDocument();
     });