Switch to ES6 modules, change test behavior

Now project is using ES6 modules and displays coverage reports for browser tests (made via karma), while nodejs tests only keygens.
bacher09 · Jun 6, 2020 · e8bf6dc · e8bf6dc
1 parent 4596541
commit e8bf6dc
Show file tree

Hide file tree

Showing 9 changed files with 186 additions and 782 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,7 +18,7 @@ script:
 - npm run browser-test
 - npm run lint
 after_sucess:
-- npm run send-coverage
+- cat coverage/lcov.info | ./node_modules/.bin/coveralls
 git:
   depth: 1
   submodules: false

diff --git a/jasmine.json b/jasmine.json
@@ -5,9 +5,10 @@
             "displayStacktrace": "all"
         }
     }],
-    "spec_dir": "src",
+    "spec_dir": "src/keygen/",
     "spec_files": ["**/*.spec.ts"],
     "helpers": [
-        "./node_modules/babel-register/lib/node.js"
+        "../node_modules/esm",
+        "../node_modules/ts-node/register/index.js"
     ]
 }
diff --git a/karma.conf.js b/karma.conf.js
@@ -1,3 +1,5 @@
+const path = require("path");
+
 module.exports = function(config) {
 
     var customLaunchers = {
@@ -33,7 +35,7 @@ module.exports = function(config) {
             {pattern: './ci/spec-bundle.js', watched: false}
         ],
         preprocessors: {
-            './ci/spec-bundle.js': ['webpack', 'sourcemap'],
+            './ci/spec-bundle.js': ['webpack'],
         },
         webpackMiddleware: {
             scripts: 'errors-only'
@@ -42,14 +44,22 @@ module.exports = function(config) {
             devtool: "inline-source-map",
             mode: "development",
             resolve: {
-                extensions: ['.ts', '.js'],
+                extensions: ['.ts', '.js', '.mjs'],
             },
             module: {
                 rules: [
                     {
                         test: /\.ts$/,
                         exclude: /node_modules/,
-                        use: [{loader: 'ts-loader', options: {transpileOnly: true}}]
+                        use: [
+                            "@jsdevtools/coverage-istanbul-loader",
+                            {loader: 'ts-loader', options: {transpileOnly: true}}
+                        ]
+                    },
+                    {
+                        test: /\.m?js$/,
+                        exclude: /node_modules/,
+                        use: [{loader: 'babel-loader', options: {presets: ['@babel/preset-env']}}]
                     }
                 ]
             },
@@ -63,7 +73,13 @@ module.exports = function(config) {
             recordVideo: false,
             recordScreenshots: false
         },
-        reporters: ["progress", "saucelabs"],
+        reporters: ["progress", "saucelabs", "coverage-istanbul"],
+        coverageIstanbulReporter: {
+            reports: ['text', 'text-summary', "lcovonly"],
+            dir: path.join(__dirname, "coverage"),
+            combineBrowserReports: true,
+            fixWebpackSourcePaths: true,
+        },
         browsers: ["ChromeHeadless", "FirefoxHeadless"],
         customLaunchers: customLaunchers,
         singleRun: true,
@@ -74,7 +90,7 @@ module.exports = function(config) {
             'karma-firefox-launcher',
             'karma-sauce-launcher',
             'karma-webpack',
-            'karma-sourcemap-loader'
+            'karma-coverage-istanbul-reporter'
         ]
     };