Merge branch 'main' of https://github.com/microsoft/powerplatform-vscode

into users/ashwanikumar/runtimePreviewECS
microsoft · Dec 16, 2024 · c9d1559 · c9d1559
2 parents a83ce18 + 9dbedcf
commit c9d1559
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 11 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -14,6 +14,34 @@
       "group": "build",
       "problemMatcher": [],
       "label": "gulp: compileWeb"
+    },
+    {
+      "type": "npm",
+      "script": "test-desktop-int",
+      "group": "test",
+      "problemMatcher": [],
+      "label": "Run Integration Tests: VS Code Deskop"
+    },
+    {
+      "type": "npm",
+      "script": "test-web-integration",
+      "group": "test",
+      "problemMatcher": [],
+      "label": "Run Integration Tests: VS Code Web"
+    },
+    {
+      "type": "npm",
+      "script": "test",
+      "group": "test",
+      "problemMatcher": [],
+      "label": "Run Unit Tests"
+    },
+    {
+      "type": "npm",
+      "script": "coverage",
+      "group": "test",
+      "problemMatcher": [],
+      "label": "Run Code Coverage"
     }
   ]
 }
diff --git a/gulpfile.mjs b/gulpfile.mjs
@@ -215,17 +215,8 @@ function testUnitTests() {
         );
 }
 
-function testWeb() {
-    return gulp.src(["src/web/client/test/unit/**/*.ts"], { read: false }).pipe(
-        mocha({
-            require: ["ts-node/register"],
-            ui: "bdd",
-        })
-    );
-}
-
 // unit tests without special test runner
-const test = gulp.series(testUnitTests, testWeb);
+const test = gulp.series(testUnitTests);
 
 /**
  * Compiles the integration tests and transpiles the results to /out
@@ -434,7 +425,6 @@ export {
     snapshot,
     lint,
     test,
-    testWeb,
     compileIntegrationTests,
     testInt,
     testWebInt,