[Reworked #202] Add simple git functions to test contract behaviour

ARCtrl.sln

@@ -55,6 +55,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "playground", "playground",
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "JavaScript", "JavaScript", "{913222CA-261F-49CB-A823-CC7C335F964A}"
 	ProjectSection(SolutionItems) = preProject
+		tests\JavaScript\ISA.CompositeHeader.js = tests\JavaScript\ISA.CompositeHeader.js
 		tests\JavaScript\ISA.Person.js = tests\JavaScript\ISA.Person.js
 		tests\JavaScript\Main.js = tests\JavaScript\Main.js
 	EndProjectSection
@@ -67,6 +68,8 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ARCtrl.Contract", "src\Cont
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FileSystem.Tests", "tests\FileSystem\FileSystem.Tests.fsproj", "{D9FE196B-AC21-4C3E-B9AE-DDDEC2158BC3}"
 EndProject
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "TestingUtils", "tests\TestingUtils\TestingUtils.fsproj", "{AA011593-6603-4E16-A7B0-0ED3862511DE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -125,6 +128,10 @@ Global
 		{D9FE196B-AC21-4C3E-B9AE-DDDEC2158BC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D9FE196B-AC21-4C3E-B9AE-DDDEC2158BC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D9FE196B-AC21-4C3E-B9AE-DDDEC2158BC3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AA011593-6603-4E16-A7B0-0ED3862511DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA011593-6603-4E16-A7B0-0ED3862511DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AA011593-6603-4E16-A7B0-0ED3862511DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AA011593-6603-4E16-A7B0-0ED3862511DE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -145,6 +152,7 @@ Global
 		{801247D5-7EE5-49C8-AB26-F822A415BA49} = {64B34A6E-318D-4E6E-9262-CE52C9B85A38}
 		{1945EE8A-F105-43A9-91C9-8C4422B9873E} = {6DA2330B-D407-4FB1-AF05-B0184034EC44}
 		{D9FE196B-AC21-4C3E-B9AE-DDDEC2158BC3} = {64B34A6E-318D-4E6E-9262-CE52C9B85A38}
+		{AA011593-6603-4E16-A7B0-0ED3862511DE} = {64B34A6E-318D-4E6E-9262-CE52C9B85A38}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1E354DE6-99BA-421E-9EF8-E808B855A85F}

RELEASE_NOTES.md

@@ -1,4 +1,4 @@
-### 1.0.0+ece863d (Released 2023-9-4)
+### 1.0.0+70f288b (Released 2023-9-20)
 * Additions:
     * Complete overhaul of the API.
     * Shifted focus from only ISA to include full ARC.

build/ProjectInfo.fs

@@ -4,12 +4,20 @@ open Fake.Core
 
 let project = "ARCtrl"
 
+/// Dotnet and JS test paths
 let testProjects = 
     [
         "tests/ISA/ISA.Tests"
         "tests/ISA/ISA.Json.Tests"
         "tests/ISA/ISA.Spreadsheet.Tests"
         "tests/FileSystem"
+        "tests/ARCtrl"
+    ]
+
+/// Native JS test paths
+let jsTestProjects =
+    [
+        "tests/JavaScript"
     ]
 
 let solutionFile  = $"{project}.sln"

build/TestTasks.fs

@@ -5,6 +5,7 @@ open Fake.DotNet
 
 open ProjectInfo
 open BasicTasks
+open Fake.Core
 
 [<AutoOpen>]
 module private Helper =
@@ -93,6 +94,17 @@ module private Helper =
 
         createProcess npmPath
 
+    let npx =
+        let npmPath =
+            match ProcessUtils.tryFindFileOnPath "npx" with
+            | Some path -> path
+            | None ->
+                "npm was not found in path. Please install it and make sure it's available from your path. " +
+                "See https://safe-stack.github.io/docs/quickstart/#install-pre-requisites for more info"
+                |> failwith
+
+        createProcess npmPath
+
     let run proc arg dir =
         proc arg dir
         |> Proc.run
@@ -105,16 +117,18 @@ module private Helper =
 
 module RunTests = 
 
-    /// runs `npm test` in root. 
-    /// npm test consists of `test` and `pretest`
-    /// check package.json in root for behavior
     let runTestsJs = BuildTask.create "runTestsJS" [clean; build] {
-        //run npm "test --prefix ./src/ISA" ""
-        run npm "test" ""
-        run npm "run testJson" ""
-        run npm "run testSpreadsheet" ""
-        run npm "run testFS" ""
-        run npm "run testjs" ""
+        for path in ProjectInfo.testProjects do
+            // transpile js files from fsharp code
+            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" ""
+        Trace.traceImportant "Start native JavaScript tests"
+        for path in ProjectInfo.jsTestProjects do
+            // transpile library for native access
+            run dotnet $"fable src/ARCtrl -o {path}/ARCtrl" ""
+            run npx $"mocha {path} --timeout 20000" "" 
     }
 
     let runTestsDotnet = BuildTask.create "runTestsDotnet" [clean; build] {
@@ -133,82 +147,4 @@ module RunTests =
 
 let runTests = BuildTask.create "RunTests" [clean; build; RunTests.runTestsJs; RunTests.runTestsDotnet] { 
     ()
-}
-
-// // ! Decided to remove watch test logic for now, as formatting is really bad anyways and we support test explorer ! //
-//module WatchTests =
-
-    //let [<Literal>] JS_FolderName = "js" 
-
-    //[<Literal>]
-    //let FableTestPath_input = "tests/ISA/ISA.Tests"
-    //let FableTestPath_output = System.IO.Path.Combine(FableTestPath_input, JS_FolderName)
-
-    //[<Literal>]
-    //let JsonFableTestPath_input = "tests/ISA/ISA.Json.Tests"
-    //let JsonFableTestPath_output = System.IO.Path.Combine(JsonFableTestPath_input, JS_FolderName)
-
-    //[<Literal>]
-    //let SpreadsheetFableTestPath_input = "tests/ISA/ISA.Spreadsheet.Tests"
-    //let SpreadsheetFableTestPath_output = System.IO.Path.Combine(SpreadsheetFableTestPath_input, JS_FolderName)
-
-//    let private watchProjTests (projPath:string) =
-//        let pName = 
-//            let n = System.IO.Path.GetFileNameWithoutExtension(projPath)
-//            $"[{n}]"
-//        pName, dotnet "watch run" projPath
-
-//    let private dotnetTestsProcesses =
-//        [
-//            for testProj in testProjects do
-//                yield watchProjTests testProj
-//        ]
-
-//    let private fableTestsProcesses =
-//        [
-//            "[ISADotNet Fable]", dotnet $"fable watch {FableTestPath_input} -o {FableTestPath_output} --run npm run test:live" "."
-//            "[ISADotNet Mocha]", npm $"run testnative:live" "."
-//            "[ISADotNet.Json Fable]", dotnet $"fable watch {JsonFableTestPath_input} -o {JsonFableTestPath_output} --run npm run testJson:live" "."
-//            "[ISADotNet.Json Mocha]", npm $"run testJsonnative:live" "."
-//        ]
-
-//    let allTest = dotnetTestsProcesses@fableTestsProcesses
-
-//    let watchTestsDotnet = BuildTask.create "watchTestsDotnet" [clean; build] {
-//        dotnetTestsProcesses
-//        |> runParallel
-//    }
-
-//    let watchJS = BuildTask.create "watchTestsJS" [clean; build] {
-//        fableTestsProcesses
-//        |> runParallel
-//    }
-
-//let watchTests = BuildTask.create "watchTests" [clean; build] {
-//    WatchTests.allTest
-//    |> runParallel
-//}
-
-//// to do: use this once we have actual tests ~ Kevin Schneider
-//// Not sure how this interacts with the changes for fable compatibility, i will..
-//// ..leave it in for now ~ Kevin Frey
-//let runTestsWithCodeCov = BuildTask.create "RunTestsWithCodeCov" [clean; build] {
-//    let standardParams = Fake.DotNet.MSBuild.CliArguments.Create ()
-//    testProjects
-//    |> Seq.iter(fun testProject -> 
-//        Fake.DotNet.DotNet.test(fun testParams ->
-//            {
-//                testParams with
-//                    MSBuildParams = {
-//                        standardParams with
-//                            Properties = [
-//                                "AltCover","true"
-//                                "AltCoverCobertura","../../codeCov.xml"
-//                                "AltCoverForce","true"
-//                            ]
-//                    };
-//                    Logger = Some "console;verbosity=detailed"
-//            }
-//        ) testProject
-//    )
-//}
+}

package.json

@@ -4,21 +4,22 @@
   "description": "Top level ARC DataModel and API function descriptions.",
   "type": "module",
   "scripts": {
+    "mocha": "mocha",
     "prebundlejs": "mkdirp .\\dist/js && dotnet fable clean -o ./dist/js --yes",
     "bundlejs": "dotnet fable ./src/ARCtrl -o ./dist/js",
     "prebundlets": "mkdirp .\\dist/ts && dotnet fable clean -o ./dist/ts --yes --extension .ts",
     "bundlets": "dotnet fable ./src/ARCtrl -o ./dist/ts --lang ts",
     "pretestJson": "dotnet fable tests/ISA/ISA.Json.Tests -o tests/ISA/ISA.Json.Tests/js",
     "testJson": "mocha tests/ISA/ISA.Json.Tests/js --timeout 20000",
-    "pretestSpreadsheet": "dotnet fable tests/ISA/ISA.Spreadsheet.Tests -o tests/ISA/ISA.Spreadsheet.Tests/js",
-    "testSpreadsheet": "mocha tests/ISA/ISA.Spreadsheet.Tests/js",
-    "pretest": "dotnet fable tests/ISA/ISA.Tests -o tests/ISA/ISA.Tests/js",
-    "test": "mocha tests/ISA/ISA.Tests/js",
-    "pretestFS": "dotnet fable tests/FileSystem -o tests/FileSystem/js",
-    "testFS": "mocha tests/FileSystem/js",
-    "pretestARC": "dotnet fable tests/ARCtrl -o tests/ARCtrl/js",
-    "testARC": "mocha tests/ARCtrl/js",
-    "pretestjs": "dotnet fable src/ARCtrl -o tests/JavaScript/ARCtrl",
+    "pretestXlsx": "dotnet fable tests/ISA/ISA.Spreadsheet.Tests -o tests/ISA/ISA.Spreadsheet.Tests/js",
+    "testXlsx": "mocha tests/ISA/ISA.Spreadsheet.Tests/js",
+    "pretestIsa": "dotnet fable tests/ISA/ISA.Tests -o tests/ISA/ISA.Tests/js",
+    "testIsa": "mocha tests/ISA/ISA.Tests/js",
+    "pretestFiles": "dotnet fable tests/FileSystem -o tests/FileSystem/js",
+    "testFiles": "mocha tests/FileSystem/js",
+    "pretestArctrl": "dotnet fable tests/ARCtrl -o tests/ARCtrl/js",
+    "testArctrl": "mocha tests/ARCtrl/js",
+    "pretestjs": "dotnet fable src/ARCtrl -o tests/JavaScript/ARCtrl ",
     "testjs": "mocha tests/JavaScript",
     "pretestpy": "dotnet fable src/ARCtrl -o tests/Python/ARCtrl --lang py ",
     "testpy": "",