From dac473ec4ee1b0ef65ad4408eaaf1c18958d51f0 Mon Sep 17 00:00:00 2001 From: imnasnainaec Date: Fri, 25 Sep 2020 10:06:49 -0400 Subject: [PATCH] Try to get lgtm to stop complaining about sensitive info in localStorage --- src/backend/tests/localStorage.test.tsx | 2 +- .../Login/tests/LoginActions.test.tsx | 2 +- .../tests/BaseGoalScreen.test.tsx | 24 ++++++++----------- .../tests/BaseGoalWidget.test.tsx | 7 +++--- 4 files changed, 16 insertions(+), 19 deletions(-) diff --git a/src/backend/tests/localStorage.test.tsx b/src/backend/tests/localStorage.test.tsx index 9cbdc5eea3..4e5a7d99b7 100644 --- a/src/backend/tests/localStorage.test.tsx +++ b/src/backend/tests/localStorage.test.tsx @@ -7,7 +7,7 @@ const mockBlacklist: Hash = { mockKey: true }; const mockProjectId: string = "mockProjId"; const mockUserId: string = "mockUserId"; const mockUser: User = { - ...new User("mockName", "mockUsername", "mockPassword"), + ...new User("mockName", "mockUsername", "mockPass"), id: mockUserId, }; diff --git a/src/components/Login/tests/LoginActions.test.tsx b/src/components/Login/tests/LoginActions.test.tsx index 42c9433d3e..5cedd6cd81 100644 --- a/src/components/Login/tests/LoginActions.test.tsx +++ b/src/components/Login/tests/LoginActions.test.tsx @@ -10,7 +10,7 @@ import * as LoginReducer from "../LoginReducer"; const createMockStore = configureMockStore([thunk]); const user = { - ...new User("testName", "testUsername", "testPassword"), + ...new User("testName", "testUsername", "testPass"), token: "testToken", email: "test@e.mail", }; diff --git a/src/goals/DefaultGoal/BaseGoalScreen/tests/BaseGoalScreen.test.tsx b/src/goals/DefaultGoal/BaseGoalScreen/tests/BaseGoalScreen.test.tsx index 1ce878f0dd..ed848c54a3 100644 --- a/src/goals/DefaultGoal/BaseGoalScreen/tests/BaseGoalScreen.test.tsx +++ b/src/goals/DefaultGoal/BaseGoalScreen/tests/BaseGoalScreen.test.tsx @@ -1,16 +1,16 @@ import React from "react"; import ReactDOM from "react-dom"; -import { User } from "../../../../types/user"; -import { Goal } from "../../../../types/goals"; -import BaseGoalScreen from "../BaseGoalScreen"; -import { MergeDups } from "../../../MergeDupGoal/MergeDups"; import { Provider } from "react-redux"; import configureMockStore from "redux-mock-store"; import thunk from "redux-thunk"; + +import { Goal } from "../../../../types/goals"; +import { User } from "../../../../types/user"; +import { MergeDups } from "../../../MergeDupGoal/MergeDups"; import { ValidateChars } from "../../../ValidateChars/ValidateChars"; +import BaseGoalScreen from "../BaseGoalScreen"; const createMockStore = configureMockStore([thunk]); - const mockStoreState = { mergeDuplicateGoal: { mergeTreeState: { @@ -33,14 +33,13 @@ const mockStoreState = { }, }, }; +const mockUser: User = new User("TestUser", "TestUsername", "TestPass"); it("renders without crashing", () => { const mockStore = createMockStore(mockStoreState); - const div = document.createElement("div"); - let user: User = new User("TestUser", "TestUsername", "password"); - let goal: Goal = new MergeDups(); - goal.user = user; + const goal: Goal = new MergeDups(); + goal.user = mockUser; ReactDOM.render( @@ -52,11 +51,9 @@ it("renders without crashing", () => { it("renders without crashing when given goal with non-existent steps", () => { const mockStore = createMockStore(mockStoreState); - const div = document.createElement("div"); - let user: User = new User("TestUser", "TestUsername", "password"); - let goal: Goal = new ValidateChars(); - goal.user = user; + const goal: Goal = new ValidateChars(); + goal.user = mockUser; ReactDOM.render( @@ -68,7 +65,6 @@ it("renders without crashing when given goal with non-existent steps", () => { it("renders without crashing when given undefined goal", () => { const mockStore = createMockStore(mockStoreState); - const div = document.createElement("div"); ReactDOM.render( diff --git a/src/goals/DefaultGoal/BaseGoalWidget/tests/BaseGoalWidget.test.tsx b/src/goals/DefaultGoal/BaseGoalWidget/tests/BaseGoalWidget.test.tsx index cf7fb0ef5f..30a2553b84 100644 --- a/src/goals/DefaultGoal/BaseGoalWidget/tests/BaseGoalWidget.test.tsx +++ b/src/goals/DefaultGoal/BaseGoalWidget/tests/BaseGoalWidget.test.tsx @@ -1,14 +1,15 @@ import React from "react"; import ReactDOM from "react-dom"; + import { User } from "../../../../types/user"; import { Goal } from "../../../../types/goals"; -import BaseGoalWidget from "../BaseGoalWidget"; import { CreateCharInv } from "../../../CreateCharInv/CreateCharInv"; +import BaseGoalWidget from "../BaseGoalWidget"; it("renders without crashing", () => { const div = document.createElement("div"); - let user: User = new User("TestUser", "TestUsername", "password"); - let goal: Goal = new CreateCharInv(); + const user: User = new User("TestUser", "TestUsername", "TestPass"); + const goal: Goal = new CreateCharInv(); goal.user = user; ReactDOM.render(, div); ReactDOM.unmountComponentAtNode(div);