From ea9a2c12c4f54d83851ad43135e9082002a8b612 Mon Sep 17 00:00:00 2001
From: Albin Henriksson <albhe428@student.liu.se>
Date: Thu, 6 May 2021 16:00:33 +0200
Subject: [PATCH] Fix test path
---
client/package.json | 3 +-
client/src/e2e/LoginPage.test.tsx | 2 +-
.../src/pages/views/components/SocketTest.tsx | 61 -------------------
3 files changed, 3 insertions(+), 63 deletions(-)
delete mode 100644 client/src/pages/views/components/SocketTest.tsx
diff --git a/client/package.json b/client/package.json
index d756f40e..d6d95ccc 100644
--- a/client/package.json
+++ b/client/package.json
@@ -72,7 +72,7 @@
"eject": "react-scripts eject",
"lint": "eslint \"./src/**/*.{ts,tsx}\"",
"test:coverage": "react-scripts test --coverage --coverageDirectory=output/coverage/jest",
- "unit-test:coverage:html": "npm test -- --testPathPattern=src/pages --testPathPattern=src/util --coverage --watchAll=false --coverageDirectory=output/coverage/jest",
+ "unit-test:coverage:html": "npm test -- --testPathIgnorePatterns=src/e2e --coverage --watchAll=false --coverageDirectory=output/coverage/jest",
"e2e-test": "npm test -- --testPathPattern=src/e2e"
},
"browserslist": {
@@ -91,6 +91,7 @@
"collectCoverageFrom": [
"src/**/*.{tsx,ts}",
"!src/index.tsx",
+ "!src/e2e/*",
"!src/reportWebVitals.ts",
"!src/components/TestConnection.tsx"
],
diff --git a/client/src/e2e/LoginPage.test.tsx b/client/src/e2e/LoginPage.test.tsx
index c13db2d8..6a60ff6b 100644
--- a/client/src/e2e/LoginPage.test.tsx
+++ b/client/src/e2e/LoginPage.test.tsx
@@ -16,7 +16,7 @@ describe('Login page', () => {
})
page = await browser.newPage()
- //Navigate to login screen and log in
+ //Navigate to login screen
await page.goto(CLIENT_URL)
await page.waitForSelector('.MuiFormControl-root')
})
diff --git a/client/src/pages/views/components/SocketTest.tsx b/client/src/pages/views/components/SocketTest.tsx
deleted file mode 100644
index 01a0a6f2..00000000
--- a/client/src/pages/views/components/SocketTest.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-import React, { useEffect } from 'react'
-import { connect } from 'react-redux'
-import { useAppDispatch } from '../../../hooks'
-import {
- socketConnect,
- socketEndPresentation,
- socketJoinPresentation,
- socketSetSlideNext,
- socketSetSlidePrev,
- socketStartPresentation,
- socketStartTimer,
-} from '../../../sockets'
-
-const mapStateToProps = (state: any) => {
- return {
- slide_order: state.presentation.slide.order,
- }
-}
-
-const mapDispatchToProps = (dispatch: any) => {
- return {
- // tickTimer: () => dispatch(tickTimer(1)),
- }
-}
-
-const SocketTest: React.FC = (props: any) => {
- const dispatch = useAppDispatch()
-
- useEffect(() => {
- socketConnect()
- // dispatch(getPresentationCompetition('1')) // TODO: Use ID of item_code gotten from auth/login/<code> api call
- // dispatch(getPresentationTeams('1')) // TODO: Use ID of item_code gotten from auth/login/<code> api call
- }, [])
-
- return (
- <>
- <button onClick={socketStartPresentation}>Start presentation</button>
- <button onClick={socketJoinPresentation}>Join presentation</button>
- <button onClick={socketEndPresentation}>End presentation</button>
- <button onClick={socketSetSlidePrev}>Prev slide</button>
- <button onClick={socketSetSlideNext}>Next slide</button>
- <button onClick={socketStartTimer}>Start timer</button>
- <div>Current slide: {props.slide_order}</div>
- {/* <div>Timer: {props.timer.value}</div>
- <div>Enabled: {props.timer.enabled.toString()}</div>
- <button onClick={syncTimer}>Sync</button>
- <button onClick={() => dispatch(setTimer(5))}>5 Sec</button>
- <button
- onClick={() => {
- dispatch(setTimer(5))
- dispatch(setTimerEnabled(true))
- syncTimer()
- }}
- >
- Sync and 5 sec
- </button> */}
- </>
- )
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(SocketTest)
--
GitLab