Skip to content

Commit

Permalink
fix: LEAP-999: Fix E2E tests on LSO (#5718)
Browse files Browse the repository at this point in the history
  • Loading branch information
juliosgarbi authored Apr 19, 2024
1 parent ff7105f commit c7ac851
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 19 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/tests-yarn-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
main:
name: "yarn e2e"
runs-on: ubuntu-latest
timeout-minutes: 20
timeout-minutes: 45
steps:
- uses: hmarr/[email protected]

Expand Down Expand Up @@ -51,6 +51,9 @@ jobs:
id: run-lsf-server
timeout-minutes: 1
working-directory: ${{ env.FRONTEND_MONOREPO_DIR }}
env:
NODE_ENV: production
BUILD_NO_MINIMIZATION: true
run: |
set -xeuo pipefail
Expand Down
8 changes: 4 additions & 4 deletions web/dist/apps/labelstudio/version.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{

Check notice on line 1 in web/dist/apps/labelstudio/version.json

View workflow job for this annotation

GitHub Actions / merge

Merge Conflict automatically resolved web/dist/apps/labelstudio/version.json
"message": "Merge branch 'develop' into 'fb-ml-release-blocker'",
"commit": "ca5ca9fde589a0d7fe849630cbb78703bb2cdc43",
"date": "2024-04-18T16:44:49.000Z",
"branch": "fb-ml-release-blocker"
"message": "Merge branch 'develop' into 'fb-leap-999'",
"commit": "1ba075f63a03d43d82e117904cd75e5520ce24f2",
"date": "2024-04-19T14:16:56.000Z",
"branch": "fb-leap-999"
}
8 changes: 4 additions & 4 deletions web/dist/libs/datamanager/version.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{

Check notice on line 1 in web/dist/libs/datamanager/version.json

View workflow job for this annotation

GitHub Actions / merge

Merge Conflict automatically resolved web/dist/libs/datamanager/version.json
"message": "Merge branch 'develop' into 'fb-ml-release-blocker'",
"commit": "ca5ca9fde589a0d7fe849630cbb78703bb2cdc43",
"date": "2024-04-18T16:44:49.000Z",
"branch": "fb-ml-release-blocker"
"message": "Merge branch 'develop' into 'fb-leap-999'",
"commit": "1ba075f63a03d43d82e117904cd75e5520ce24f2",
"date": "2024-04-19T14:16:56.000Z",
"branch": "fb-leap-999"
}
2 changes: 1 addition & 1 deletion web/dist/libs/editor/main.js

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions web/dist/libs/editor/version.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{

Check notice on line 1 in web/dist/libs/editor/version.json

View workflow job for this annotation

GitHub Actions / merge

Merge Conflict automatically resolved web/dist/libs/editor/version.json
"message": "Merge branch 'develop' into 'fb-ml-release-blocker'",
"commit": "ca5ca9fde589a0d7fe849630cbb78703bb2cdc43",
"date": "2024-04-18T16:44:49.000Z",
"branch": "fb-ml-release-blocker"
"message": "Merge branch 'develop' into 'fb-leap-999'",
"commit": "1ba075f63a03d43d82e117904cd75e5520ce24f2",
"date": "2024-04-19T14:16:56.000Z",
"branch": "fb-leap-999"
}
2 changes: 1 addition & 1 deletion web/libs/editor/tests/e2e/codecept.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ module.exports.config = {
show: !headless,
restart: 'context',
timeout: 60000, // Action timeout after 60 seconds
waitForAction: headless ? 100 : 1200,
waitForAction: headless ? 300 : 1200,
windowSize: '1200x900',
waitForNavigation: 'networkidle',
browser: 'chromium',
Expand Down
8 changes: 4 additions & 4 deletions web/libs/editor/tests/e2e/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1994,10 +1994,10 @@ fn-args@^4.0.0:
resolved "https://registry.yarnpkg.com/fn-args/-/fn-args-4.0.0.tgz#2e912f7a74c5e9ef25060bd60127d6a8680237a5"
integrity sha512-M9XSagc92ejQhi+7kjpFPAO59xKbGRsbOg/9dfwSj84DfzB0pj+Q81DVD1pKr084Xf2oICwUNI0pCvGORmD9zg==

follow-redirects@^1.14.0:
version "1.15.5"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.5.tgz#54d4d6d062c0fa7d9d17feb008461550e3ba8020"
integrity sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==
follow-redirects@^1.14.0, follow-redirects@^1.15.5:
version "1.15.6"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==

foreground-child@^2.0.0:
version "2.0.0"
Expand Down

0 comments on commit c7ac851

Please sign in to comment.