squashed linting fix (microsoft#93)

Co-authored-by: Alexander Metzger <alexander@metzger.dk> fixed unit tests fixed tests fixed lint fixed actions
uve · Aug 4, 2023 · 80767f9 · 80767f9
1 parent fff44e9
commit 80767f9
Show file tree

Hide file tree

Showing 8 changed files with 7,376 additions and 30,590 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, dev ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ main ]
+    branches: [ main, dev ]
   schedule:
     - cron: '15 4 * * 5'
 

diff --git a/karma.conf.ts b/karma.conf.ts
@@ -34,9 +34,7 @@ const testRecursivePath = "test/visualTest.ts";
 const srcOriginalRecursivePath = "src/**/*.ts";
 const coverageFolder = "coverage";
 
-process.env.CHROME_BIN = require("puppeteer").executablePath();
-
-//import { Config, ConfigOptions } from "karma";
+process.env.CHROME_BIN = require("playwright").chromium.executablePath();
 
 module.exports = (config) => {
     config.set({
@@ -47,8 +45,7 @@ module.exports = (config) => {
         frameworks: ["jasmine"],
         reporters: [
             "progress",
-            "junit",
-            "coverage-istanbul"
+            "junit"
         ],
         junitReporter: {
             outputDir: path.join(__dirname, coverageFolder),
@@ -64,22 +61,19 @@ module.exports = (config) => {
             "karma-sourcemap-loader",
             "karma-chrome-launcher",
             "karma-junit-reporter",
-            "karma-coverage-istanbul-reporter"
         ],
         files: [
-            "node_modules/jquery/dist/jquery.min.js",
-            "node_modules/jasmine-jquery/lib/jasmine-jquery.js",
+            {
+                pattern: './capabilities.json',
+                watched: false,
+                served: true,
+                included: false
+            },
             testRecursivePath,
             {
                 pattern: srcOriginalRecursivePath,
                 included: false,
                 served: true
-            },
-            {
-                pattern: '**/*.json',
-                watched: true,
-                served: true,
-                included: false
             }
         ],
         preprocessors: {
@@ -88,18 +82,6 @@ module.exports = (config) => {
         typescriptPreprocessor: {
             options: tsconfig.compilerOptions
         },
-        coverageIstanbulReporter: {
-            reports: ["html", "lcovonly", "text-summary", "cobertura"],
-            dir: path.join(__dirname, coverageFolder),
-            'report-config': {
-                html: {
-                    subdir: 'html-report'
-                }
-            },
-            combineBrowserReports: true,
-            fixWebpackSourcePaths: true,
-            verbose: false
-        },
         coverageReporter: {
             dir: path.join(__dirname, coverageFolder),
             reporters: [