From 102be890994791cc6301cf395e06b2e4fd01e824 Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Fri, 4 Jun 2021 09:02:31 +0200
Subject: [PATCH] improved unit testing plugin path

---
 apps/remix-ide/src/app/tabs/test-tab.js       | 81 ++++++++++++-------
 .../remix-ide/src/app/tabs/testTab/testTab.js |  1 +
 apps/remix-ide/src/lib/helper.js              |  8 ++
 3 files changed, 59 insertions(+), 31 deletions(-)

diff --git a/apps/remix-ide/src/app/tabs/test-tab.js b/apps/remix-ide/src/app/tabs/test-tab.js
index c880fabcc3..f2e9ece175 100644
--- a/apps/remix-ide/src/app/tabs/test-tab.js
+++ b/apps/remix-ide/src/app/tabs/test-tab.js
@@ -1,5 +1,7 @@
 import { ViewPlugin } from '@remixproject/engine-web'
 import { canUseWorker, urlFromVersion } from '../compiler/compiler-utils'
+import * as helper from '../../lib/helper'
+
 var yo = require('yo-yo')
 var async = require('async')
 var tooltip = require('../ui/tooltip')
@@ -52,18 +54,26 @@ module.exports = class TestTab extends ViewPlugin {
   }
 
   listenToEvents () {
-    this.on('filePanel', 'newTestFileCreated', file => {
-      var testList = this._view.el.querySelector("[class^='testList']")
-      var test = this.createSingleTest(file)
-      testList.appendChild(test)
+    this.on('filePanel', 'newTestFileCreated', async file => {
+      try {
+        await this.testTabLogic.getTests((error, tests) => {
+          if (error) return tooltip(error)
+          this.data.allTests = tests
+          this.data.selectedTests = [...this.data.allTests]
+          this.updateTestFileList(tests)
+          if (!this.testsOutput) return // eslint-disable-line
+        })
+      } catch (e) {
+        console.log(e)
+      }
       this.data.allTests.push(file)
       this.data.selectedTests.push(file)
     })
 
-    this.on('filePanel', 'setWorkspace', () => {
+    this.on('filePanel', 'setWorkspace', async () => {
       this.testTabLogic.setCurrentPath(this.defaultPath)
       this.inputPath.value = this.defaultPath
-      this.updateForNewCurrent()
+      await this.updateForNewCurrent()
     })
 
     this.fileManager.events.on('noFileSelected', () => {
@@ -72,18 +82,23 @@ module.exports = class TestTab extends ViewPlugin {
     this.fileManager.events.on('currentFileChanged', (file, provider) => this.updateForNewCurrent(file))
   }
 
-  updateForNewCurrent (file) {
-    this.updateGenerateFileAction()
-    if (!this.areTestsRunning) this.updateRunAction(file)
+  async updateForNewCurrent (file) {
+    this.data.allTests = []
     this.updateTestFileList()
     this.clearResults()
-    this.testTabLogic.getTests((error, tests) => {
-      if (error) return tooltip(error)
-      this.data.allTests = tests
-      this.data.selectedTests = [...this.data.allTests]
-      this.updateTestFileList(tests)
-      if (!this.testsOutput) return // eslint-disable-line
-    })
+    this.updateGenerateFileAction()
+    if (!this.areTestsRunning) this.updateRunAction(file)
+    try {
+      await this.testTabLogic.getTests((error, tests) => {
+        if (error) return tooltip(error)
+        this.data.allTests = tests
+        this.data.selectedTests = [...this.data.allTests]
+        this.updateTestFileList(tests)
+        if (!this.testsOutput) return // eslint-disable-line
+      })
+    } catch (e) {
+      console.log(e)
+    }
   }
 
   createSingleTest (testFile) {
@@ -96,7 +111,7 @@ module.exports = class TestTab extends ViewPlugin {
   }
 
   listTests () {
-    if (!this.data.allTests) return []
+    if (!this.data.allTests || !this.data.allTests.length) return []
     return this.data.allTests.map(
       testFile => this.createSingleTest(testFile)
     )
@@ -587,9 +602,10 @@ module.exports = class TestTab extends ViewPlugin {
   }
 
   async handleTestDirInput (e) {
-    const testDirInput = this.trimTestDirInput(this.inputPath.value)
+    let testDirInput = this.trimTestDirInput(this.inputPath.value)
+    testDirInput = helper.removeMultipleSlashes(testDirInput)
     if (e.key === 'Enter') {
-      this.inputPath.value = this.trimTestDirInput(testDirInput)
+      this.inputPath.value = testDirInput
       if (await this.testTabLogic.pathExists(testDirInput)) {
         this.testTabLogic.setCurrentPath(testDirInput)
         this.updateForNewCurrent()
@@ -599,6 +615,7 @@ module.exports = class TestTab extends ViewPlugin {
 
     if (testDirInput) {
       if (testDirInput.endsWith('/')) {
+        testDirInput = helper.removeTrailingSlashes(testDirInput)
         if (this.testTabLogic.currentPath === testDirInput.substr(0, testDirInput.length - 1)) {
           this.createTestFolder.disabled = true
           this.updateGenerateFileAction().disabled = true
@@ -612,7 +629,7 @@ module.exports = class TestTab extends ViewPlugin {
         } else {
           // Enable Create button
           this.createTestFolder.disabled = false
-          // Disable Generate button because dir is not existing
+          // Disable Generate button because dir does not exist
           this.updateGenerateFileAction().disabled = true
         }
       }
@@ -621,6 +638,16 @@ module.exports = class TestTab extends ViewPlugin {
     }
   }
 
+  async handleEnter (e) {
+    this.inputPath.value = helper.removeMultipleSlashes(this.trimTestDirInput(this.inputPath.value))
+    if (this.createTestFolder.disabled) {
+      if (await this.testTabLogic.pathExists(this.inputPath.value)) {
+        this.testTabLogic.setCurrentPath(this.inputPath.value)
+        this.updateForNewCurrent()
+      }
+    }
+  }
+
   render () {
     this.onActivationInternal()
     this.testsOutput = yo`<div class="mx-3 mb-2 pb-4 border-top border-primary" hidden='true' id="solidityUnittestsOutput" data-id="testTabSolidityUnitTestsOutput"></a>`
@@ -636,16 +663,7 @@ module.exports = class TestTab extends ViewPlugin {
       name="utPath"
       style="background-image: var(--primary);"
       onkeyup=${(e) => this.handleTestDirInput(e)}
-      onchange=${async (e) => {
-        if (this.createTestFolder.disabled) {
-          this.inputPath.value = this.trimTestDirInput(this.inputPath.value)
-          if (await this.testTabLogic.pathExists(this.inputPath.value)) {
-            this.inputPath.value = this.trimTestDirInput(this.inputPath.value)
-            this.testTabLogic.setCurrentPath(this.inputPath.value)
-            this.updateForNewCurrent()
-          }
-        }
-      }}
+      onchange=${async (e) => this.handleEnter(e)}
     />`
 
     this.createTestFolder = yo`
@@ -654,7 +672,8 @@ module.exports = class TestTab extends ViewPlugin {
         data-id="testTabGenerateTestFolder"
         title="Create a test folder"
         disabled=true
-        onclick=${(e) => this.handleCreateFolder()}>
+        onclick=${(e) => this.handleCreateFolder()}
+      >
         Create
       </button>
     `
diff --git a/apps/remix-ide/src/app/tabs/testTab/testTab.js b/apps/remix-ide/src/app/tabs/testTab/testTab.js
index 04aec9d94e..e1fcf2d09e 100644
--- a/apps/remix-ide/src/app/tabs/testTab/testTab.js
+++ b/apps/remix-ide/src/app/tabs/testTab/testTab.js
@@ -17,6 +17,7 @@ class TestTabLogic {
     // Todo move this check to File Manager after refactoring
     // Checking to ignore the value which contains only whitespaces
     if (!path || !(/\S/.test(path))) return
+    path = helper.removeMultipleSlashes(path)
     const fileProvider = this.fileManager.fileProviderOf(path.split('/')[0])
     fileProvider.exists(path).then(res => {
       if (!res) fileProvider.createDir(path)
diff --git a/apps/remix-ide/src/lib/helper.js b/apps/remix-ide/src/lib/helper.js
index 0486c557d0..f352803282 100644
--- a/apps/remix-ide/src/lib/helper.js
+++ b/apps/remix-ide/src/lib/helper.js
@@ -104,6 +104,14 @@ module.exports = {
     const hexValue = hash.slice(2, hash.length)
     return this.is0XPrefixed(hash) && /^[0-9a-fA-F]{64}$/.test(hexValue)
   },
+  removeTrailingSlashes (text) {
+    // Single or consecutive leading slashes:
+    return text.replace(/^\/+/g, '')
+  },
+  removeMultipleSlashes (text) {
+    // Replace consecutive slashes with '/'
+    return text.replace(/\/+/g, '/')
+  },
   find: find,
   getPathIcon (path) {
     return path.endsWith('.txt')