Skip to content
This repository has been archived by the owner on May 3, 2024. It is now read-only.

Commit

Permalink
test(integration): use seleniarm
Browse files Browse the repository at this point in the history
  • Loading branch information
JAdshead committed Jan 8, 2024
1 parent 176f1e8 commit 926790c
Show file tree
Hide file tree
Showing 6 changed files with 443 additions and 210 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG VERSION=lts
ARG VERSION=18.17.1
# Use the pre-baked fat node image only in the builder
# which includes build utils preinstalled (e.g. gcc, make, etc).
# This will result in faster and reliable One App docker image
Expand Down
3 changes: 3 additions & 0 deletions __tests__/integration/helpers/testRunner.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ const setUpTestRunner = async ({
'selenium-chrome': {
ports: [
`${seleniumServerPort}:4444`,
'7901:7900',
'5901:5900',
],
},
...oneAppLocalPortToUse && {
Expand Down Expand Up @@ -103,6 +105,7 @@ const setUpTestRunner = async ({
path: '/wd/hub',
port: seleniumServerPort,
capabilities: {
acceptInsecureCerts: true,
'goog:chromeOptions': {
...!oneAppLocalPortToUse && process.env.HTTPS_PROXY
&& { args: [`--proxy-server=${process.env.HTTPS_PROXY}`] },
Expand Down
4 changes: 2 additions & 2 deletions __tests__/integration/one-app.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,7 @@ describe('Tests that require Docker setup', () => {
{
level: 'SEVERE',
message: expect.stringMatching(
/https:\/\/one-app:8443\/demo\/healthy-frank - Failed to find a valid digest in the 'integrity' attribute for resource 'https:\/\/sample-cdn\.frank\/modules\/.+\/healthy-frank\/0\.0\.0\/healthy-frank.browser.js' with computed SHA-256 integrity '.+'\. The resource has been blocked\./
/https:\/\/one-app:8443\/demo\/healthy-frank - Failed to find a valid digest in the 'integrity' attribute for resource 'https:\/\/sample-cdn\.frank\/modules\/.+\/healthy-frank\/0\.0\.0\/healthy-frank.browser.js' with computed SHA-384 integrity '.+'\. The resource has been blocked\./
),
source: 'security',
timestamp: expect.any(Number),
Expand Down Expand Up @@ -1711,7 +1711,7 @@ describe('Tests that can run against either local Docker setup or remote One App
'accept-language': 'en-US,en;q=0.9',
host: expect.any(String),
'user-agent':
'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',
'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
},
method: 'GET',
originalUrl: '/vitruvius',
Expand Down
Loading

0 comments on commit 926790c

Please sign in to comment.