Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
d9faef6
wip
lerouxb Jan 9, 2024
e6d6d2c
Merge branch 'main' into compass-web-e2e
lerouxb Jan 16, 2024
f10a099
first try!
lerouxb Jan 18, 2024
878aa9f
upgrade webdriver, test in firefox
lerouxb Jan 22, 2024
99fe15b
more promises not being awaited
lerouxb Jan 22, 2024
79841df
remove wait-port
lerouxb Jan 22, 2024
4a5e6ac
update package-lock.json again
lerouxb Jan 22, 2024
63e2f3d
Merge branch 'main' into compass-web-e2e
lerouxb Jan 22, 2024
2bb1a15
can go either way
lerouxb Jan 23, 2024
6991e45
fix
lerouxb Jan 23, 2024
af1ed0a
compass-web e2e tests CI
lerouxb Jan 24, 2024
b4b8b2e
Merge branch 'main' into compass-web-e2e
lerouxb Jan 24, 2024
4f6ced2
debug why it ran everything
lerouxb Jan 24, 2024
e061342
skip more tests after merge
lerouxb Jan 24, 2024
66cf7e9
swap the stop order
lerouxb Jan 24, 2024
d9160d2
unsafe-perm because why not?
lerouxb Jan 24, 2024
4e2c569
workarounds
lerouxb Jan 24, 2024
ad322df
hack for testing in electron
lerouxb Jan 24, 2024
f9e6ceb
remove console.log
lerouxb Jan 25, 2024
416af04
Merge branch 'main' into compass-web-e2e
lerouxb Jan 25, 2024
f31c0a3
WIP
lerouxb Jan 26, 2024
828d099
factor out the common election & browser setup
lerouxb Jan 26, 2024
0a329e9
yolo
lerouxb Jan 29, 2024
b72bb80
Merge branch 'main' into compass-web-e2e
lerouxb Jan 29, 2024
2700981
fix elements.map()
lerouxb Jan 29, 2024
a5cb9ce
some fixes for webdriver 8
lerouxb Jan 31, 2024
67541ba
cleanup
lerouxb Jan 31, 2024
9f3705e
use wrapBinary as a better hack for positional args
lerouxb Jan 31, 2024
05c94c9
waitUntil in the URI options dropdown
lerouxb Jan 31, 2024
cbe1b98
script fix
lerouxb Jan 31, 2024
61fcf0c
Merge branch 'main' into compass-web-e2e
lerouxb Feb 1, 2024
f941c99
revert display size increase
lerouxb Feb 1, 2024
c51e301
oops. add back x24
lerouxb Feb 1, 2024
4c5a3bd
don't quote the params?
lerouxb Feb 1, 2024
1ccce76
Merge branch 'main' into compass-web-e2e
lerouxb Feb 1, 2024
bdc20ce
log
lerouxb Feb 1, 2024
1a0aefa
quote the binary path
lerouxb Feb 2, 2024
6d21172
remove .only
lerouxb Feb 2, 2024
3276b1e
expected text changed ever so slightly
lerouxb Feb 2, 2024
8bc46eb
regex to normalise the output before checking
lerouxb Feb 2, 2024
af87938
use setValueVisible everywhere
lerouxb Feb 2, 2024
f91aa42
type
lerouxb Feb 2, 2024
bd3c6d7
quote more things
lerouxb Feb 2, 2024
ae6cd6e
log wrapper script again
lerouxb Feb 6, 2024
d372eb5
Merge branch 'main' into compass-web-e2e
lerouxb Feb 6, 2024
4544162
quoting again, .only for now
lerouxb Feb 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .evergreen/buildvariants.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,10 @@ buildvariants:
- name: test-packaged-app-latest
depends_on: package-compass

- name: test-web-sandbox-chrome

- name: test-web-sandbox-firefox

- name: windows
display_name: Windows 10 (Test and Package)
run_on: windows-vsCurrent-large
Expand Down
21 changes: 20 additions & 1 deletion .evergreen/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -137,6 +138,24 @@
},
"skip_on": ["macos-1100", "macos-1100-arm64", "rhel76-large"]
}
],
"test-web-sandbox": [
{
"name": "chrome",
"vars": {
"mongodb_version": "latest-alpha-enterprise",
"browser_name": "chrome"
},
"skip_on": ["macos-1100", "macos-1100-arm64", "rhel76-large", "windows-vsCurrent-large"]
},
{
"name": "firefox",
"vars": {
"mongodb_version": "latest-alpha-enterprise",
"browser_name": "firefox"
},
"skip_on": ["macos-1100", "macos-1100-arm64", "rhel76-large", "windows-vsCurrent-large"]
}
]
}
},
Expand Down
25 changes: 24 additions & 1 deletion .evergreen/functions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ functions:
sleep 20
done
echo "SSH connection established after $attempts attempts"

# Write the host info so that it can be used by the signing tool
if [[ $OSTYPE == "cygwin" ]]; then
identity_file=$(cygpath -wa "$identity_file")
Expand Down Expand Up @@ -527,6 +527,29 @@ 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
Expand Down
24 changes: 21 additions & 3 deletions .evergreen/tasks.in.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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*'
<% } %>
39 changes: 39 additions & 0 deletions .evergreen/tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ tasks:
vars:
compass_distribution: compass-isolated


- name: test-packaged-app-40x-community
tags: ['required-for-publish', 'run-on-pr']
commands:
Expand Down Expand Up @@ -416,3 +417,41 @@ tasks:
mongodb_version: 'latest-alpha-enterprise'
compass_distribution: compass
debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'


- name: test-web-sandbox-chrome
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: 'chrome'
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*'

Loading