Merge remote-tracking branch 'origin/beta-releases' into ga-releases

Author: github-actions[bot]

.evergreen/buildvariants.yml

@@ -90,6 +90,8 @@ buildvariants:
       - name: test-packaged-app-latest
         depends_on: package-compass
 
+      - name: test-web-sandbox-firefox
+
   - name: windows
     display_name: Windows 10 (Test and Package)
     run_on: windows-vsCurrent-large

.evergreen/config.json

@@ -12,7 +12,8 @@
       "test",
       ["test-electron", { "gui": true }],
       "package",
-      ["test-packaged-app", { "gui": true, "depends_on": "package-compass" }]
+      ["test-packaged-app", { "gui": true, "depends_on": "package-compass" }],
+      ["test-web-sandbox", { "gui": true }]
     ]
   },
   "tasks": {
@@ -137,6 +138,16 @@
           },
           "skip_on": ["macos-1100", "macos-1100-arm64", "rhel76-large"]
         }
+      ],
+      "test-web-sandbox": [
+        {
+          "name": "firefox",
+          "vars": {
+            "mongodb_version": "latest-alpha-enterprise",
+            "browser_name": "firefox"
+          },
+          "skip_on": ["macos-1100", "macos-1100-arm64", "rhel76-large", "windows-vsCurrent-large"]
+        }
       ]
     }
   },

.evergreen/functions.yml

@@ -534,6 +534,28 @@ functions:
 
           npm run --unsafe-perm --workspace compass-e2e-tests test-packaged-ci
 
+  test-web-sandbox:
+    - command: shell.exec
+      # Fail the task if it's idle for 10 mins
+      timeout_secs: 600
+      params:
+        working_dir: src
+        shell: bash
+        env:
+          <<: *compass-env
+          COMPASS_APP_PATH_ORIGINAL: ${appPath}
+          COMPASS_APP_NAME: ${packagerOptions.name}
+          DEBUG: ${debug|}
+          MONGODB_VERSION: ${mongodb_version|}
+          MONGODB_RUNNER_VERSION: ${mongodb_version|}
+          BROWSER_NAME: ${browser_name}
+        script: |
+          set -e
+          # Load environment variables
+          eval $(.evergreen/print-compass-env.sh)
+          source .evergreen/start-docker-envs.sh
+          npm run --unsafe-perm --workspace compass-e2e-tests test-web
+
   test-connectivity:
     - command: shell.exec
       # Fail the task if it's idle for 10 mins

.evergreen/tasks.in.yml

@@ -114,8 +114,8 @@ tasks:
       - func: save-all-artifacts
         vars:
           compass_distribution: <% out(packageTask.vars.compass_distribution) %>
-<% };
-for (const testPackagedTask of tasks['test-packaged-app']) { %>
+<% } %>
+<% for (const testPackagedTask of tasks['test-packaged-app']) { %>
   - name: <% out(testPackagedTask.name) %>
     tags: ['required-for-publish', 'run-on-pr']
     commands:
@@ -135,4 +135,22 @@ for (const testPackagedTask of tasks['test-packaged-app']) { %>
           <% out(`${key}: '${value}'`) } %>
           compass_distribution: compass
           debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
+<% } %>
+<% for (const testPackagedTask of tasks['test-web-sandbox']) { %>
+  - name: <% out(testPackagedTask.name) %>
+    tags: ['required-for-publish', 'run-on-pr']
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: 'compass-e2e-tests'
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: test-web-sandbox
+        vars: <% for (const [key, value] of Object.entries(testPackagedTask.vars)) { %>
+          <% out(`${key}: '${value}'`) } %>
+          compass_distribution: compass
+          debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
 <% } %>

.evergreen/tasks.yml

@@ -157,6 +157,7 @@ tasks:
         vars:
           compass_distribution: compass-isolated
 
+
   - name: test-packaged-app-40x-community
     tags: ['required-for-publish', 'run-on-pr']
     commands:
@@ -416,3 +417,22 @@ tasks:
           mongodb_version: 'latest-alpha-enterprise'
           compass_distribution: compass
           debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
+
+
+  - name: test-web-sandbox-firefox
+    tags: ['required-for-publish', 'run-on-pr']
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: 'compass-e2e-tests'
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: test-web-sandbox
+        vars: 
+          mongodb_version: 'latest-alpha-enterprise'
+          browser_name: 'firefox'
+          compass_distribution: compass
+          debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'

THIRD-PARTY-NOTICES.md

@@ -39,7 +39,7 @@ const tsxOverrides = {
 
 const testJsOverrides = {
   ...common.testOverrides,
-  files: ['**/*.spec.js', '**/*.spec.jsx', '**/*.test.js'],
+  files: ['**/*.spec.js', '**/*.spec.jsx', '**/*.test.js', '**/test/**/*.js'],
   rules: {
     ...common.testRules,
     '@mongodb-js/compass/unique-mongodb-log-id': 'off',
@@ -48,7 +48,13 @@ const testJsOverrides = {
 };
 
 const testTsOverrides = {
-  files: ['**/*.spec.ts', '**/*.spec.tsx', '**/*.test.tsx', '**/*.test.ts'],
+  files: [
+    '**/*.spec.ts',
+    '**/*.spec.tsx',
+    '**/*.test.tsx',
+    '**/*.test.ts',
+    '**/test/**/*.ts',
+  ],
   rules: {
     ...common.testRules,
     ...extraTsRules,

configs/eslint-config-compass/index.js

@@ -20,8 +20,7 @@ module.exports = {
       restrictedProviderImport('mongodb-data-service'),
       restrictedProviderImport('@mongodb-js/compass-logging'),
       restrictedProviderImport('@mongodb-js/compass-app-stores'),
-      // TODO(COMPASS-7411): enable when possible
-      // restrictedProviderImport('@mongodb-js/my-queries-storage'),
+      restrictedProviderImport('@mongodb-js/my-queries-storage'),
       // TODO(COMPASS-7412): enable when possible
       // restrictedProviderImport('@mongodb-js/atlas-service'),
       restrictedProviderImport('compass-preferences-model'),