From 1074a715f9fc51a4fd5bee368d353e0bf46412f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Gu=CC=88nther?= Date: Thu, 5 Dec 2024 09:45:09 +0100 Subject: [PATCH 1/2] TASK: Use chrome and set higher timeout for CircleCI --- .circleci/config.yml | 2 +- .sauce/config.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 41f32f1b68..db58357564 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -145,7 +145,7 @@ jobs: echo "Using target branch: $TARGET_BRANCH" - run: name: Prepare and run e2e tests - no_output_timeout: 30m + no_output_timeout: 45m command: | export NVM_DIR="$HOME/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" diff --git a/.sauce/config.yml b/.sauce/config.yml index 5d836840ea..f573895839 100644 --- a/.sauce/config.yml +++ b/.sauce/config.yml @@ -18,8 +18,8 @@ testcafe: # Controls what files are available in the context of a test run (unless explicitly excluded by .sauceignore). rootDir: ./ suites: - - name: "Tests in Firefox on Windows" - browserName: "firefox" + - name: "Tests in Chrome on Windows" + browserName: "chrome" src: - "Tests/IntegrationTests/Fixtures/*/*.e2e.js" platformName: "Windows 10" From bcee6c37f6273229447d7d369fa692ea61da3c5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Gu=CC=88nther?= Date: Thu, 5 Dec 2024 10:15:45 +0100 Subject: [PATCH 2/2] TASK: Run tests in Chrome and Firefox --- .sauce/config.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.sauce/config.yml b/.sauce/config.yml index f573895839..f5510705cf 100644 --- a/.sauce/config.yml +++ b/.sauce/config.yml @@ -18,19 +18,18 @@ testcafe: # Controls what files are available in the context of a test run (unless explicitly excluded by .sauceignore). rootDir: ./ suites: + - name: "Tests in Firefox on Windows" + browserName: "firefox" + src: + - "Tests/IntegrationTests/Fixtures/*/*.e2e.js" + platformName: "Windows 10" + screenResolution: "1280x1024" - name: "Tests in Chrome on Windows" browserName: "chrome" src: - "Tests/IntegrationTests/Fixtures/*/*.e2e.js" platformName: "Windows 10" screenResolution: "1280x1024" - # todo use chrome here and fix ci https://github.com/neos/neos-ui/issues/3591 (but even firefox fails in ci) - # - name: "Tests in Firefox on MacOS" - # browserName: "firefox" - # src: - # - "Tests/IntegrationTests/Fixtures/*/*.e2e.js" - # platformName: "macOS 13" - # screenResolution: "1440x900" npm: dependencies: - testcafe-react-selectors