diff --git a/package-lock.json b/package-lock.json index 1d9c2e9..5a88d35 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7361,9 +7361,9 @@ "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==" }, "immer": { - "version": "7.0.9", - "resolved": "https://registry.npmjs.org/immer/-/immer-7.0.9.tgz", - "integrity": "sha512-Vs/gxoM4DqNAYR7pugIxi0Xc8XAun/uy7AQu4fLLqaTBHxjOP9pJ266Q9MWA/ly4z6rAFZbvViOtihxUZ7O28A==" + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/immer/-/immer-8.0.1.tgz", + "integrity": "sha512-aqXhGP7//Gui2+UrEtvxZxSquQVXTpZ7KDxfCcKAF3Vysvw0CViVaW9RZ1j1xlIYqaaaipBoqdqeibkc18PNvA==" }, "import-cwd": { "version": "2.1.0", @@ -9969,9 +9969,9 @@ } }, "open": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/open/-/open-7.4.0.tgz", - "integrity": "sha512-PGoBCX/lclIWlpS/R2PQuIR4NJoXh6X5AwVzE7WXnWRGvHg7+4TBCgsujUgiPpm0K1y4qvQeWnCWVTpTKZBtvA==", + "version": "7.4.2", + "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz", + "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==", "requires": { "is-docker": "^2.0.0", "is-wsl": "^2.1.1" @@ -11697,9 +11697,9 @@ } }, "react-dev-utils": { - "version": "11.0.2", - "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.2.tgz", - "integrity": "sha512-xG7GlMoYkrgc2M1kDCHKRywXMDbFnjOB+/VzpytQyYBusEzR8NlGTMmUbvN86k94yyKu5XReHB8eZC2JZrNchQ==", + "version": "11.0.4", + "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.4.tgz", + "integrity": "sha512-dx0LvIGHcOPtKbeiSUM4jqpBl3TcY7CDjZdfOIcKeznE7BWr9dg0iPG90G5yfVQ+p/rGNMXdbfStvzQZEVEi4A==", "requires": { "@babel/code-frame": "7.10.4", "address": "1.1.2", @@ -11714,7 +11714,7 @@ "global-modules": "2.0.0", "globby": "11.0.1", "gzip-size": "5.1.1", - "immer": "7.0.9", + "immer": "8.0.1", "is-root": "2.1.0", "loader-utils": "2.0.0", "open": "^7.0.2", diff --git a/src/components/App/App.test.js b/src/components/App/App.test.js index c816b0d..e9da1e6 100644 --- a/src/components/App/App.test.js +++ b/src/components/App/App.test.js @@ -4,9 +4,9 @@ jest.mock("../Contexts/VehicleContext"); import { render, screen, cleanup, waitForElementToBeRemoved } from "@testing-library/react"; import { setToken } from "../Contexts/UserContext"; +import { TEST_AUTH_OBJECT } from "../../utils/testing" import App from "."; -const TEST_TOKEN = { idToken: { jwtToken: "TEST" } }; const LOADING_STATUS = "Loading..."; const renderRoute = async (route) => { @@ -37,6 +37,12 @@ describe("App", () => { expect(container).toMatchSnapshot(); }); + it("Route /package-upload unauthenticated", async () => { + const container = await renderRoute("/package-upload"); + expect(container.querySelector("span.MuiButton-label").innerHTML).toEqual("Sign In"); + expect(container).toMatchSnapshot(); + }); + it("Route /vehicle-add unauthenticated", async () => { const container = await renderRoute("/vehicle-add"); expect(container.querySelector("span.MuiButton-label").innerHTML).toEqual("Sign In"); @@ -44,21 +50,28 @@ describe("App", () => { }); it("Route / authenticated", async () => { - setToken(TEST_TOKEN); + setToken(TEST_AUTH_OBJECT); const container = await renderRoute("/"); - expect(container.querySelector("h1").innerHTML).toEqual("Upload Update Package"); + expect(container.querySelector("h1").innerHTML).toEqual("Welcome John!"); expect(container).toMatchSnapshot(); }); it("Route /home authenticated", async () => { - setToken(TEST_TOKEN); + setToken(TEST_AUTH_OBJECT); const container = await renderRoute("/home"); + expect(container.querySelector("h1").innerHTML).toEqual("Welcome John!"); + expect(container).toMatchSnapshot(); + }); + + it("Route /package-upload authenticated", async () => { + setToken(TEST_AUTH_OBJECT); + const container = await renderRoute("/package-upload"); expect(container.querySelector("h1").innerHTML).toEqual("Upload Update Package"); expect(container).toMatchSnapshot(); }); it("Route /vehicle-add authenticated", async () => { - setToken(TEST_TOKEN); + setToken(TEST_AUTH_OBJECT); const container = await renderRoute("/vehicle-add"); expect(container.querySelector("h1").innerHTML).toEqual("Add Vehicle"); expect(container).toMatchSnapshot(); @@ -71,7 +84,7 @@ describe("App", () => { }); it("Route /page-not-found authenticated", async () => { - setToken(TEST_TOKEN); + setToken(TEST_AUTH_OBJECT); const container = await renderRoute("/page-not-found"); expect(container.querySelector("h1").innerHTML).toEqual("Page Not Found"); expect(container).toMatchSnapshot(); diff --git a/src/components/App/__snapshots__/App.test.js.snap b/src/components/App/__snapshots__/App.test.js.snap index f2b0a88..0be10e1 100644 --- a/src/components/App/__snapshots__/App.test.js.snap +++ b/src/components/App/__snapshots__/App.test.js.snap @@ -6,17 +6,17 @@ exports[`App Route / authenticated 1`] = ` data-testid="mocked-userprovider" >
-
-
-

- Upload Update Package -

-
-
- -
- - -
-
-
- -
- - -
-
-
- -
-