Fix test tasks still using mocha

nfdi4plants · Apr 2, 2024 · 562ce65 · 562ce65
1 parent b15a377
commit 562ce65
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 42 deletions.
diff --git a/ARCtrl.sln b/ARCtrl.sln
@@ -29,11 +29,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{64B34A6E
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "JavaScript", "JavaScript", "{913222CA-261F-49CB-A823-CC7C335F964A}"
 	ProjectSection(SolutionItems) = preProject
-		tests\JavaScript\ARCtrl.Index.js = tests\JavaScript\ARCtrl.Index.js
-		tests\JavaScript\ISA.CompositeCell.js = tests\JavaScript\ISA.CompositeCell.js
-		tests\JavaScript\ISA.CompositeHeader.js = tests\JavaScript\ISA.CompositeHeader.js
-		tests\JavaScript\ISA.Person.js = tests\JavaScript\ISA.Person.js
+		tests\JavaScript\CompositeCell.js = tests\JavaScript\CompositeCell.js
+		tests\JavaScript\CompositeHeader.js = tests\JavaScript\CompositeHeader.js
 		tests\JavaScript\Main.js = tests\JavaScript\Main.js
+		tests\JavaScript\Person.js = tests\JavaScript\Person.js
 		tests\JavaScript\Template.Web.js = tests\JavaScript\Template.Web.js
 	EndProjectSection
 EndProject

diff --git a/build/TestTasks.fs b/build/TestTasks.fs
@@ -33,20 +33,9 @@ module RunTests =
             run dotnet $"fable {path} -o {path}/js" ""
             // run mocha in target path to execute tests
             // "--timeout 20000" is used, because json schema validation takes a bit of time.
-            run npx $"mocha {path}/js --timeout 20000" ""
+            run node $"{path}/js/Main.js" ""
     }
 
-    /// <summary>
-    /// Until we reach full Py compatibility we use these paths to check only compatible projects
-    /// </summary>
-    let testProjectsPy = 
-        [
-            //"tests/ISA/ISA.Tests"
-            //"tests/ISA/ISA.Json.Tests"
-            //"tests/ISA/ISA.Spreadsheet.Tests"
-            "tests/ARCtrl"
-        ]
-
     let runTestsPy = BuildTask.create "runTestsPy" [clean; build] {
         for path in ProjectInfo.testProjects do
             //transpile py files from fsharp code

diff --git a/tests/JavaScript/ARCtrl.Index.js b/tests/JavaScript/ARCtrl.Index.js