Merge branch 'develop'

CHANGELOG.md

@@ -9,6 +9,11 @@
     The creation of the tag can be disabled with the --no-git-tag-version if desired.
 -->
 
+# v4.6.6 - 26 August 2022
+
+## Fixes
+- Fixed an issue where the sorting selection was not honored for sub-techniques when rendered as an SVG. See issue [#494](https://github.com/mitre-attack/attack-navigator/issues/494).
+
 # v4.6.5 - 7 July 2022
 
 Adds support for ATT&CK v11.3 and Mobile ATT&CK sub-techniques.

nav-app/karma.conf.js

@@ -6,11 +6,12 @@ module.exports = function (config) {
     basePath: '',
     frameworks: ['jasmine', '@angular-devkit/build-angular'],
     plugins: [
-      require('karma-jasmine'),
+      require('@angular-devkit/build-angular/plugins/karma'),
       require('karma-chrome-launcher'),
+      require('karma-coverage'),
+      // require('karma-coverage-istanbul-reporter'),
+      require('karma-jasmine'),
       require('karma-jasmine-html-reporter'),
-      require('karma-coverage-istanbul-reporter'),
-      require('@angular-devkit/build-angular/plugins/karma')
     ],
     client:{
       clearContext: false // leave Jasmine Spec Runner output visible in browser
@@ -20,13 +21,32 @@ module.exports = function (config) {
       fixWebpackSourcePaths: true
     },
 
-    reporters: ['progress', 'kjhtml'],
+    reporters: ['progress', 'kjhtml', 'coverage'],
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,
     autoWatch: true,
-    browsers: ['Chrome'],
+    browsers: ['Chrome', 'ChromeHeadlessCI'],
+    customLaunchers: {
+      ChromeHeadlessCI: {
+        base: 'ChromeHeadless',
+        flags: ['--no-sandbox']
+      }
+    },
     singleRun: false,
-    webpack: { node: { fs: 'empty', } } //https://github.com/angular/angular-cli/issues/8357
+    webpack: { node: { fs: 'empty', } }, // https://github.com/angular/angular-cli/issues/8357
+
+    // For code coverage
+    files: [
+      'src/**/*.ts'
+    ],
+    preprocessors: {
+      'src/**/*.js': ['coverage']
+    },
+    coverageReporter: {
+      type : 'html',
+      dir : 'coverage/'
+    }
+
   });
 };