Split keyboardInteraction.test.js into three parts, with one describe… (#606)

* Concatenate and minify CSS

* Split keyboardInteraction.test.js into three parts:

popupTabNavigation.test.js / popupTabNavigation.html
tabFeatureNavigation.test.js / tabFeatureNavigation.html
reticle.test.js / reticle.html

* Hit everything with async / await, on the theory that individual tests 
should be treated like promises, and expect should be treated likewise, per
this description: https://jestjs.io/docs/asynchronous#asyncawait 

* split new test file:linkTypes.test.js / linkTypes.html from featureLinks.test.js

* Add linkTypes.html test page so that linkTypes.test.js doesn't depend on
featureLinks.html.

* Update jshint esversion, Add hints to jshint.

* add playwright 'peer' dependencies. jest-circus, jest-environment-node,
so you should run npm install again

* Update jest-playwright config to latest version syntax

* Split up mapMLTemplatedFeatures.test.js

* Update CI to use "grunt default" instead of "grunt clean copy rollup",
to catch all tasks required for testing, including css minification per above

Co-authored-by: Malvoz <[email protected]>
Co-authored-by: Robert Linder <[email protected]>

Author: prushforth

.github/workflows/ci-testing.yml

@@ -16,7 +16,7 @@ jobs:
     - run: sudo apt-get install xvfb
     - run: npm install
     - run: npm install -g grunt-cli
-    - run: grunt clean copy rollup
+    - run: grunt default
     - run: xvfb-run --auto-servernum -- npm test
       env:
         CI: true

Gruntfile.js

@@ -11,6 +11,17 @@ module.exports = function(grunt) {
 //        dest: 'dist/c.js'
 //      }
 //    },
+    cssmin: {
+      options: {
+        mergeIntoShorthands: false,
+        roundingPrecision: -1
+      },
+      combine: {
+        files: {
+        'dist/mapml.css': ['node_modules/leaflet/dist/leaflet.css', 'src/mapml.css']
+        }
+      }
+    },
     uglify: {
       options: {
        banner: '/*! <%= pkg.name %> <%= grunt.template.today("dd-mm-yyyy") %> */\n'
@@ -32,7 +43,7 @@ module.exports = function(grunt) {
         },
         // ensure that jshint keeps processing after an error
         force: true,
-        esversion: 6
+        esversion: 11
 
       }
     },
@@ -152,6 +163,7 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-watch');
 //  grunt.loadNpmTasks('grunt-contrib-concat');
   grunt.loadNpmTasks('grunt-contrib-copy');
+  grunt.loadNpmTasks('grunt-contrib-cssmin');
   grunt.loadNpmTasks('grunt-contrib-clean');
   grunt.loadNpmTasks('grunt-rollup');
 
@@ -160,7 +172,7 @@ module.exports = function(grunt) {
 
   grunt.registerTask('test', ['jshint']);
 
-  grunt.registerTask('default', ['clean:dist', 'copy', 'jshint', 'rollup', 'uglify']);
+  grunt.registerTask('default', ['clean:dist', 'copy', 'jshint', 'rollup', 'uglify', 'cssmin']);
   grunt.registerTask('build', ['rollup']);
 
 };

jest-playwright.config.js

@@ -5,8 +5,10 @@ module.exports = {
         launchTimeout: 10000,
     },
     launchOptions: {
-        headless: true,
+      headless: true,
+    },
+    connectOptions: {
         slowMo: 250,
     },
     browsers: ["chromium"],
-}
+}

jest.config.js

@@ -11,7 +11,7 @@ module.exports = {
       globals: {
         PATH: "http://localhost:30001/",
       },
-      testMatch: ["**/test/e2e/**/*.test.js", "!**/test/e2e/**/keyboardInteraction.test.js"]
+      testMatch: ["**/test/e2e/**/*.test.js"]
   }
   ]
 };