Skip to content

Commit fb7de80

Browse files
committed
Merge remote-tracking branch 'origin/main' into electron-32
2 parents fb4f812 + fa94752 commit fb7de80

21 files changed

+586
-255
lines changed

.depalignrc.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
],
2727
"js-yaml": [
2828
"^3.13.1"
29+
],
30+
"yargs": [
31+
"^4.8.1"
2932
]
3033
}
3134
}

.evergreen/functions.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -597,10 +597,9 @@ functions:
597597
DEBUG: ${debug|}
598598
MONGODB_VERSION: ${mongodb_version|}
599599
MONGODB_RUNNER_VERSION: ${mongodb_version|}
600-
E2E_TEST_GROUPS: ${e2e_test_groups}
601-
E2E_TEST_GROUP: ${e2e_test_group}
600+
COMPASS_E2E_TEST_GROUPS: ${e2e_test_groups}
601+
COMPASS_E2E_TEST_GROUP: ${e2e_test_group}
602602
ATLAS_LOCAL_VERSION: latest
603-
HADRON_DISTRIBUTION: compass
604603
script: |
605604
set -e
606605
# Load environment variables
@@ -629,8 +628,8 @@ functions:
629628
DEBUG: ${debug|}
630629
MONGODB_VERSION: ${mongodb_version|}
631630
MONGODB_RUNNER_VERSION: ${mongodb_version|}
632-
E2E_TEST_GROUPS: ${e2e_test_groups}
633-
E2E_TEST_GROUP: ${e2e_test_group}
631+
COMPASS_E2E_TEST_GROUPS: ${e2e_test_groups}
632+
COMPASS_E2E_TEST_GROUP: ${e2e_test_group}
634633
script: |
635634
set -e
636635
# Load environment variables
@@ -664,14 +663,14 @@ functions:
664663
DEBUG: ${debug|}
665664
MONGODB_VERSION: ${mongodb_version|}
666665
MONGODB_RUNNER_VERSION: ${mongodb_version|}
667-
COMPASS_WEB_BROWSER_NAME: ${browser_name}
668-
E2E_TEST_GROUPS: ${e2e_test_groups}
669-
E2E_TEST_GROUP: ${e2e_test_group}
666+
COMPASS_E2E_BROWSER_NAME: ${browser_name}
667+
COMPASS_E2E_TEST_GROUPS: ${e2e_test_groups}
668+
COMPASS_E2E_TEST_GROUP: ${e2e_test_group}
670669
script: |
671670
set -e
672671
# Load environment variables
673672
eval $(.evergreen/print-compass-env.sh)
674-
npm run --unsafe-perm --workspace compass-e2e-tests test-web
673+
npm run --unsafe-perm --workspace compass-e2e-tests test-ci web
675674
676675
test-connectivity:
677676
- command: shell.exec
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: "Check PR Title"
2+
on:
3+
pull_request:
4+
types: [opened, synchronize, reopened, ready_for_review, labeled, unlabeled, converted_to_draft, edited]
5+
6+
jobs:
7+
check-pr-title:
8+
name: Check PR Title
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Enforce conventional commit style
12+
uses: realm/ci-actions/title-checker@main
13+
with:
14+
regex: '^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test|ops){1}(\([\w\-\.]+\))?(!)?: .*'
15+
error-hint: 'Invalid PR title. Make sure it follows the conventional commit specification (i.e. "<type>(<optional scope>): <description>") or add the no-title-validation label'
16+
ignore-labels: 'no-title-validation'
17+
- name: Enforce JIRA ticket in title
18+
uses: realm/ci-actions/title-checker@main
19+
# Skip the JIRA ticket check for PRs opened by bots
20+
if: ${{ !contains(github.event.pull_request.user.login, '[bot]') }}
21+
with:
22+
regex: '[A-Z]{4,10}-[0-9]{1,5}$'
23+
error-hint: 'Invalid PR title. Make sure it ends with a JIRA ticket - i.e. COMPASS-1234 or add the no-title-validation label'
24+
ignore-labels: 'no-title-validation'

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,3 +93,4 @@ Kræn Hansen <[email protected]>
9393
Kræn Hansen <[email protected]>
9494
Ruchitha Rajaghatta <[email protected]>
9595
96+
Nikola Irinchev <[email protected]>

THIRD-PARTY-NOTICES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
The following third-party software is used by and included in **Mongodb Compass**.
2-
This document was automatically generated on Thu Oct 24 2024.
2+
This document was automatically generated on Mon Oct 28 2024.
33

44
## List of dependencies
55

docs/tracking-plan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
# Compass Tracking Plan
33

4-
Generated on Thu, Oct 24, 2024 at 09:52 AM
4+
Generated on Mon, Oct 28, 2024 at 12:44 PM
55

66
## Table of Contents
77

package-lock.json

Lines changed: 139 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/compass-e2e-tests/helpers/commands/connect-form.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ import type { CompassBrowser } from '../compass-browser';
44
import * as Selectors from '../selectors';
55
import type { ConnectFormState } from '../connect-form-state';
66
import Debug from 'debug';
7-
import { DEFAULT_CONNECTIONS } from '../test-runner-context';
7+
import {
8+
DEFAULT_CONNECTIONS,
9+
isTestingAtlasCloudExternal,
10+
} from '../test-runner-context';
811
import { getConnectionTitle } from '@mongodb-js/connection-info';
912
const debug = Debug('compass-e2e-tests');
1013

@@ -925,6 +928,12 @@ export async function saveConnection(
925928
}
926929

927930
export async function setupDefaultConnections(browser: CompassBrowser) {
931+
// When running tests against Atlas Cloud, connections can't be added or
932+
// removed from the UI manually, so we skip setup for default connections
933+
if (isTestingAtlasCloudExternal()) {
934+
return;
935+
}
936+
928937
/*
929938
This is intended to be used by most test files (ones that don't care too much
930939
about the intricacies about connections) in a before() hook after starting

packages/compass-e2e-tests/helpers/commands/screenshot.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import path from 'path';
22
import type { CompassBrowser } from '../compass-browser';
3-
import { LOG_SCREENSHOTS_PATH } from '../test-runner-context';
3+
import { LOG_SCREENSHOTS_PATH } from '../test-runner-paths';
44

55
const withTimeout = (millis: number, promise: Promise<any>) => {
66
let timeoutPid: NodeJS.Timeout;

0 commit comments

Comments
 (0)