From b275f9fafa098d17640013b2c921f110d55ca375 Mon Sep 17 00:00:00 2001
From: dan <dan.du@leidos.com>
Date: Mon, 4 Dec 2023 09:50:08 -0500
Subject: [PATCH] fix unit test

---
 .github/workflows/tests.yml                   | 24 ++++++++++++++++++-
 .../web_app/client/src/pages/Grafana.js       |  2 +-
 .../client/src/tests/pages/Grafana.test.js    | 17 ++++++-------
 3 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index b71aa322..247ecdb3 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -108,8 +108,30 @@ jobs:
           name: web-app-client
           path: telematic_system/telematic_apps/web_app/client/coverage/*
           if-no-files-found: error
+  web_app_server_coverage:
+    runs-on: ubuntu-latest
+    container:
+      image: node:16.16.0
+      options: --user root
+      env:
+        CI: true
+    steps:
+      - name: Checkout ${{ github.event.repository.name }}
+        uses: actions/checkout@v3
+      - name: Build
+        run: |
+          cd $GITHUB_WORKSPACE/telematic_system/telematic_apps/web_app/server
+          npm init -y
+          npm install --force
+          npm test -- --coverage || true
+      - name: Archive code coverage results
+        uses: actions/upload-artifact@v3
+        with:
+          name: web-app-server
+          path: telematic_system/telematic_apps/web_app/server/coverage/*
+          if-no-files-found: error
   sonar:
-    needs: [carma_vehicle_bridge_coverage, carma_cloud_bridge_coverage, telematic_cloud_messaging_coverage, web_app_client_coverage]
+    needs: [carma_vehicle_bridge_coverage, carma_cloud_bridge_coverage, telematic_cloud_messaging_coverage, web_app_client_coverage, web_app_server_coverage]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout ${{ github.event.repository.name }}
diff --git a/telematic_system/telematic_apps/web_app/client/src/pages/Grafana.js b/telematic_system/telematic_apps/web_app/client/src/pages/Grafana.js
index 6c18336a..50f96dbe 100644
--- a/telematic_system/telematic_apps/web_app/client/src/pages/Grafana.js
+++ b/telematic_system/telematic_apps/web_app/client/src/pages/Grafana.js
@@ -47,7 +47,7 @@ const Grafana = () => {
           width="100%"
           height="100%"
           frameBorder="0"
-          allowFullScreen />
+          allowFullscreen />
       </Grid>
 
     </React.Fragment>
diff --git a/telematic_system/telematic_apps/web_app/client/src/tests/pages/Grafana.test.js b/telematic_system/telematic_apps/web_app/client/src/tests/pages/Grafana.test.js
index 13a95e66..20487b38 100644
--- a/telematic_system/telematic_apps/web_app/client/src/tests/pages/Grafana.test.js
+++ b/telematic_system/telematic_apps/web_app/client/src/tests/pages/Grafana.test.js
@@ -1,14 +1,15 @@
-import { afterEach, jest, test } from '@jest/globals'
-import { fireEvent, render, screen } from '@testing-library/react'
+import { test } from '@jest/globals'
+import { render, screen } from '@testing-library/react'
 import { act } from 'react-dom/test-utils'
+import { BrowserRouter } from 'react-router-dom'
 import Grafana from '../../pages/Grafana'
 
-test('Forgot password page', async () => {
+test('Grafana page', async () => {
     await act(async () => {
-        render(<Grafana />)
+        render(
+            <BrowserRouter>
+                <Grafana />
+            </BrowserRouter>)
     })
-
-    await act(async () => {
-        // fireEvent.load()
-    });
+    expect(screen.getByRole('progressbar')).toBeInTheDocument();
 })