From d1f2a6b84fa2bcc7518dcfac130998540d034ccd Mon Sep 17 00:00:00 2001
From: aniket-engg <aniketengg.225@gmail.com>
Date: Mon, 17 Jan 2022 13:07:51 +0530
Subject: [PATCH 1/4] slash in input box handled

---
 .../src/lib/solidity-unit-testing.tsx         | 22 +------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx b/libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx
index 2acb1ee4e4..c8952801f8 100644
--- a/libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx
+++ b/libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx
@@ -167,15 +167,7 @@ export const SolidityUnitTesting = (props: Record<string, any>) => { // eslint-d
   const handleTestDirInput = async (e: any) => { // eslint-disable-line @typescript-eslint/no-explicit-any
     let testDirInput = trimTestDirInput(e.target.value)
     testDirInput = helper.removeMultipleSlashes(testDirInput)
-    if (testDirInput !== '/') testDirInput = helper.removeTrailingSlashes(testDirInput)
     setInputPathValue(testDirInput)
-    if (e.key === 'Enter') {
-      if (await testTabLogic.pathExists(testDirInput)) {
-        testTabLogic.setCurrentPath(testDirInput)
-        await updateForNewCurrent()
-        return
-      }
-    }
     if (testDirInput) {
       if (testDirInput.endsWith('/') && testDirInput !== '/') {
         testDirInput = helper.removeTrailingSlashes(testDirInput)
@@ -205,17 +197,6 @@ export const SolidityUnitTesting = (props: Record<string, any>) => { // eslint-d
     }
   }
 
-  const handleEnter = async (e: any) => { // eslint-disable-line @typescript-eslint/no-explicit-any
-    let inputPath = e.target.value
-    inputPath = helper.removeMultipleSlashes(trimTestDirInput(inputPath))
-    setInputPathValue(inputPath)
-    if (disableCreateButton) {
-      if (await testTabLogic.pathExists(inputPath)) {
-        await setCurrentPath(inputPath)
-      }
-    }
-  }
-
   const handleCreateFolder = async () => {
     let inputPath = trimTestDirInput(inputPathValue)
     let path = helper.removeMultipleSlashes(inputPath)
@@ -674,8 +655,7 @@ export const SolidityUnitTesting = (props: Record<string, any>) => { // eslint-d
               title="Press 'Enter' to change the path for test files."
               style={{ backgroundImage: "var(--primary)" }}
               onKeyDown={() => { if (inputPathValue === '/') setInputPathValue('')} }
-              onKeyUp={handleTestDirInput}
-              onChange={handleEnter}
+              onChange={handleTestDirInput}
               onClick = {() => { if (inputPathValue === '/') setInputPathValue('')} }
             />
             <button

From 24b8f2b173d3eded5b61ad9e818edc1944a26506 Mon Sep 17 00:00:00 2001
From: aniket-engg <aniketengg.225@gmail.com>
Date: Mon, 17 Jan 2022 17:44:34 +0530
Subject: [PATCH 2/4] fix multiple test file selection

---
 .../src/lib/solidity-unit-testing.tsx         | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx b/libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx
index c8952801f8..7980d43562 100644
--- a/libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx
+++ b/libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx
@@ -67,6 +67,7 @@ export const SolidityUnitTesting = (props: Record<string, any>) => { // eslint-d
   let [readyTestsNumber, setReadyTestsNumber] = useState<number>(0) // eslint-disable-line
   let [runningTestsNumber, setRunningTestsNumber] = useState<number>(0) // eslint-disable-line
 
+  const areTestsRunning = useRef<boolean>(false)
   const hasBeenStopped = useRef<boolean>(false)
   const isDebugging = useRef<boolean>(false)
   const allTests = useRef<string[]>([])
@@ -74,7 +75,6 @@ export const SolidityUnitTesting = (props: Record<string, any>) => { // eslint-d
   const currentErrors:any = useRef([]) // eslint-disable-line @typescript-eslint/no-explicit-any
 
   const defaultPath = 'tests'
-  let areTestsRunning = false
 
   let runningTestFileName: string
   const filesContent: Record<string, Record<string, string>> = {}
@@ -113,7 +113,7 @@ export const SolidityUnitTesting = (props: Record<string, any>) => { // eslint-d
       allTests.current = tests
       selectedTests.current = [...allTests.current]
       updateTestFileList()
-      if (!areTestsRunning) await updateRunAction(file)
+      if (!areTestsRunning.current) await updateRunAction(file)
     } catch (e: any) { // eslint-disable-line @typescript-eslint/no-explicit-any
       console.log(e)
       setToasterMsg(e)
@@ -500,7 +500,7 @@ export const SolidityUnitTesting = (props: Record<string, any>) => { // eslint-d
       if (selectedTests.current?.length !== 0) {
         setDisableRunButton(false)
       }
-      areTestsRunning = false
+      areTestsRunning.current = false
     }
   }
 
@@ -547,7 +547,7 @@ export const SolidityUnitTesting = (props: Record<string, any>) => { // eslint-d
   }
 
   const runTests = () => {
-    areTestsRunning = true
+    areTestsRunning.current = true
     hasBeenStopped.current = false
     readyTestsNumber = 0
     setReadyTestsNumber(readyTestsNumber)
@@ -568,8 +568,8 @@ export const SolidityUnitTesting = (props: Record<string, any>) => { // eslint-d
 
   const updateRunAction = async (currentFile: any = null) => { // eslint-disable-line @typescript-eslint/no-explicit-any
     const isSolidityActive = await testTab.appManager.isActive('solidity')
-    if (!isSolidityActive || !selectedTests.current?.length) {
-      // setDisableRunButton(true)
+    if (!isSolidityActive || !selectedTests.current.length) {
+      setDisableRunButton(true)
       if (!currentFile || (currentFile && currentFile.split('.').pop().toLowerCase() !== 'sol')) {
         setRunButtonTitle('No solidity file selected')
       } else {
@@ -592,7 +592,7 @@ export const SolidityUnitTesting = (props: Record<string, any>) => { // eslint-d
 
   const toggleCheckbox = (eChecked: boolean, index: number) => {
     testFiles[index].checked = eChecked
-    setTestFiles(testFiles)
+    setTestFiles([...testFiles])
     selectedTests.current = getCurrentSelectedTests()
     if (eChecked) {
       setCheckSelectAll(true)
@@ -609,7 +609,7 @@ export const SolidityUnitTesting = (props: Record<string, any>) => { // eslint-d
 
   const checkAll = (event: any) => { // eslint-disable-line @typescript-eslint/no-explicit-any
     testFiles.forEach((testFileObj) => testFileObj.checked = event.target.checked)
-    setTestFiles(testFiles)
+    setTestFiles([...testFiles])
     setCheckSelectAll(event.target.checked)
     if (event.target.checked) {
       selectedTests.current = getCurrentSelectedTests()
@@ -627,7 +627,7 @@ export const SolidityUnitTesting = (props: Record<string, any>) => { // eslint-d
     }
     else
       testFiles = []
-    setTestFiles(testFiles)
+    setTestFiles([...testFiles])
   }
 
   return (
@@ -708,7 +708,7 @@ export const SolidityUnitTesting = (props: Record<string, any>) => { // eslint-d
           />
           <label className="text-nowrap pl-2 mb-0" htmlFor="checkAllTests"> Select all </label>
         </div>
-        <div className="testList py-2 mt-0 border-bottom">{testFiles?.length ? testFiles.map((testFileObj: TestObject, index) => {
+        <div className="testList py-2 mt-0 border-bottom">{testFiles.length ? testFiles.map((testFileObj: TestObject, index) => {
           const elemId = `singleTest${testFileObj.fileName}`
           return (
             <div className="d-flex align-items-center py-1" key={index}>

From 2182401927cfabf8cf84341d1deb8c988fa3a310 Mon Sep 17 00:00:00 2001
From: aniket-engg <aniketengg.225@gmail.com>
Date: Tue, 18 Jan 2022 13:11:11 +0530
Subject: [PATCH 3/4] e2e fix

---
 .../solidity-unit-testing/src/lib/solidity-unit-testing.tsx     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx b/libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx
index 7980d43562..db799747b8 100644
--- a/libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx
+++ b/libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx
@@ -575,7 +575,7 @@ export const SolidityUnitTesting = (props: Record<string, any>) => { // eslint-d
       } else {
         setRunButtonTitle('The "Solidity Plugin" should be activated')
       }
-    }
+    } else setDisableRunButton(false)
   }
 
   const stopTests = () => {

From ba73304a512b111fa23200a1b4ca61ad4fb2e1db Mon Sep 17 00:00:00 2001
From: aniket-engg <aniketengg.225@gmail.com>
Date: Tue, 18 Jan 2022 14:15:48 +0530
Subject: [PATCH 4/4] fix test file listing after deletion

---
 .../solidity-unit-testing/src/lib/solidity-unit-testing.tsx     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx b/libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx
index db799747b8..9f9da608f9 100644
--- a/libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx
+++ b/libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx
@@ -153,7 +153,7 @@ export const SolidityUnitTesting = (props: Record<string, any>) => { // eslint-d
       await setCurrentPath(defaultPath)
     })
 
-    testTab.fileManager.events.on('noFileSelected', () => { }) // eslint-disable-line
+    testTab.fileManager.events.on('noFileSelected', async () => { await updateForNewCurrent() })
     testTab.fileManager.events.on('currentFileChanged', async (file: string) => await updateForNewCurrent(file))
 
   }, []) // eslint-disable-line