Merge pull request #12686 from dannon/rxjs-upgrade

RxJS major version upgrade, client unit testing enhancements.

.github/workflows/jest.yaml

@@ -18,16 +18,15 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Setup node
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v2
       with:
         node-version: ${{ matrix.node}}
-    - uses: mvdbeek/gha-yarn-cache@master
-      with:
-        yarn-lock-file: 'client/yarn.lock'
+        cache: 'yarn'
+        cache-dependency-path: 'client/yarn.lock'
     - run: yarn install --frozen-lockfile
       working-directory: client
-    - name: Build Client
-      run: yarn run build
+    - name: Stage client libs (Gulp)
+      run: yarn run gulp client
       working-directory: client
     - name: Run Unit Tests
       run: yarn run qunit

client/package.json

@@ -23,7 +23,7 @@
     "@fortawesome/vue-fontawesome": "^2.0.2",
     "@galaxyproject/bootstrap-tour": "^0.12.1",
     "@handsontable/vue": "^2.0.0-beta1",
-    "@hirez_io/observer-spy": "^2.0.0",
+    "@hirez_io/observer-spy": "^2.1.0",
     "@johmun/vue-tags-input": "^2.1.0",
     "@sentry/browser": "^5.20.1",
     "axios": "^0.21.1",
@@ -71,8 +71,8 @@
     "pyre-to-regexp": "^0.0.5",
     "regression": "^2.0.1",
     "requirejs": "2.3.6",
-    "rxjs": "^6.6.3",
-    "rxjs-spy": "^7.5.3",
+    "rxjs": "^7.4.0",
+    "rxjs-spy": "^8.0.0",
     "rxjs-spy-devtools-plugin": "^0.0.4",
     "slugify": "^1.6.0",
     "splitpanes": "2.3.8",
@@ -129,12 +129,13 @@
     "@cerner/duplicate-package-checker-webpack-plugin": "^2.1.0",
     "@testing-library/jest-dom": "^5.14.1",
     "@vue/test-utils": "^1.2.2",
+    "@vue/vue2-jest": "^27.0.0-alpha.2",
     "amdi18n-loader": "^0.9.3",
     "autoprefixer": "^10.3.5",
     "axios-mock-adapter": "^1.20.0",
     "babel-core": "^7.0.0-bridge.0",
     "babel-eslint": "^10.1.0",
-    "babel-jest": "^27.2.1",
+    "babel-jest": "^27.2.5",
     "babel-loader": "^8.2.2",
     "babel-plugin-transform-inline-environment-variables": "^0.4.3",
     "babel-plugin-transform-vue-template": "^0.4.2",
@@ -150,7 +151,7 @@
     "gulp": "^4.0.2",
     "ignore-loader": "^0.1.2",
     "imports-loader": "^3.0.0",
-    "jest": "^27.2.1",
+    "jest": "^27.2.5",
     "jest-raw-loader": "^1.0.1",
     "jest-transform-yaml": "0.1.2",
     "json-loader": "^0.5.7",
@@ -171,7 +172,6 @@
     "store": "^2.0.12",
     "style-loader": "^3.3.0",
     "uuid": "^8.3.2",
-    "vue-jest": "^3.0.6",
     "vue-loader": "^15.9.8",
     "vue-styleguidist": "^4.41.2",
     "vue-template-compiler": "^2.6.14",

client/tests/jest/jest.config.js

@@ -3,7 +3,7 @@ const path = require("path");
 // For a detailed explanation regarding each configuration property, visit:
 // https://jestjs.io/docs/en/configuration.html
 
-const modulesToTransform = ["bootstrap-vue/src/components/form-input"];
+const modulesToTransform = ["bootstrap-vue", "rxjs", "@hirez_io"].join("|");
 
 module.exports = {
     // All imported modules in your tests should be mocked automatically
@@ -81,6 +81,7 @@ module.exports = {
         "^config$": "<rootDir>/tests/jest/__mocks__/config.js",
         "utils/localization$": "<rootDir>/tests/jest/__mocks__/localization.js",
         "viz/trackster$": "<rootDir>/tests/jest/__mocks__/trackster.js",
+        "rxjs/internal/scheduler/AsyncScheduler": "<rootDir>/node_modules/rxjs/dist/esm/internal/scheduler/AsyncScheduler.js"
     },
 
     // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
@@ -169,9 +170,9 @@ module.exports = {
 
     // A map from regular expressions to paths to transformers
     transform: {
-        [`(${modulesToTransform}).+\\.js$`]: "vue-jest",
-        ".*\\.(vue)$": "vue-jest",
+        // [`(${modulesToTransform}).+\\.js$`]: "vue-jest",
         "^.+\\.js$": "babel-jest",
+        ".*\\.(vue)$": "@vue/vue2-jest",
         "\\.yml$": "jest-transform-yaml",
         "\\.txt$": "jest-raw-loader",
     },