Skip to content

Commit 925fc1c

Browse files
mschilemschile
authored
Merge branch 'develop' into mschile/service_worker
2 parents 54e07f5 + 1d934c6 commit 925fc1c

22 files changed

+283
-224
lines changed

‎.github/workflows/semantic-pull-request.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ jobs:
2929
runs-on: ubuntu-latest
3030
steps:
3131
- name: Checkout
32-
uses: actions/checkout@v3
32+
uses: actions/checkout@v4
3333
with:
3434
ref: ${{ github.event.pull_request.head.ref }}
3535
repository: ${{ github.event.pull_request.head.repo.full_name }}
3636
- run: npm install
3737
working-directory: scripts/github-actions/semantic-pull-request/
3838
- name: Lint PR Title and Cypress Changelog Entry
3939
if: github.event_name == 'pull_request_target'
40-
uses: actions/github-script@v6
40+
uses: actions/github-script@v7
4141
with:
4242
script: |
4343
const verifyPullRequest = require('./scripts/github-actions/semantic-pull-request')

‎.github/workflows/snyk_sca_scan.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ jobs:
2121
node-version: [18.x]
2222
steps:
2323
- name: Checkout
24-
uses: actions/checkout@v3
24+
uses: actions/checkout@v4
2525
with:
2626
fetch-depth: 0
2727
token: ${{ secrets.BOT_GITHUB_ACTION_TOKEN }}
2828
- name: Set up Node.js
29-
uses: actions/setup-node@v3
29+
uses: actions/setup-node@v4
3030
with:
3131
node-version: 18
3232
cache: 'yarn'

‎.github/workflows/snyk_static_analysis_scan.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
1818
with:
1919
fetch-depth: 0
2020
token: ${{ secrets.BOT_GITHUB_ACTION_TOKEN }}
2121
- name: Set up Node.js
22-
uses: actions/setup-node@v3
22+
uses: actions/setup-node@v4
2323
with:
2424
node-version: 18
2525
cache: 'yarn'

‎.github/workflows/triage_add_to_project.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,17 @@ jobs:
4949
runs-on: ubuntu-latest
5050
steps:
5151
- name: Checkout code
52-
uses: actions/checkout@v3
52+
uses: actions/checkout@v4
5353
with:
5454
repository: 'cypress-io/release-automations'
5555
ref: 'master'
5656
ssh-key: ${{ secrets.WORKFLOW_DEPLOY_KEY }}
5757
- name: Set up Node.js
58-
uses: actions/setup-node@v3
58+
uses: actions/setup-node@v4
5959
with:
6060
node-version: 'lts/*'
6161
- name: Run comment_workflow.js Script
62-
uses: actions/github-script@v6
62+
uses: actions/github-script@v7
6363
with:
6464
github-token: ${{ secrets.TRIAGE_BOARD_TOKEN }}
6565
script: |

‎.github/workflows/triage_handle_new_comments.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout code
17-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
1818
with:
1919
repository: 'cypress-io/release-automations'
2020
ref: 'master'
2121
ssh-key: ${{ secrets.WORKFLOW_DEPLOY_KEY }}
2222
- name: Set up Node.js
23-
uses: actions/setup-node@v3
23+
uses: actions/setup-node@v4
2424
with:
2525
node-version: 'lts/*'
2626
- name: Run comment_workflow.js Script
27-
uses: actions/github-script@v6
27+
uses: actions/github-script@v7
2828
with:
2929
github-token: ${{ secrets.TRIAGE_BOARD_TOKEN }}
3030
script: |

‎.github/workflows/update-browser-versions.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
BASE_BRANCH: develop
1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616
with:
1717
fetch-depth: 0
1818
token: ${{ secrets.BOT_GITHUB_ACTION_TOKEN }}
@@ -26,12 +26,12 @@ jobs:
2626
git fetch origin
2727
git checkout ${{ env.BASE_BRANCH }}
2828
- name: Set up Node.js
29-
uses: actions/setup-node@v3
29+
uses: actions/setup-node@v4
3030
with:
3131
node-version: 18
3232
- name: Check for new Chrome versions
3333
id: get-versions
34-
uses: actions/github-script@v6
34+
uses: actions/github-script@v7
3535
with:
3636
script: |
3737
const { getVersions } = require('./scripts/github-actions/update-browser-versions.js')
@@ -56,7 +56,7 @@ jobs:
5656
- name: Check need for update on existing branch
5757
if: ${{ steps.check-need-for-pr.outputs.needs_branch_update == 'true' }}
5858
id: check-need-for-branch-update
59-
uses: actions/github-script@v6
59+
uses: actions/github-script@v7
6060
with:
6161
script: |
6262
const { checkNeedForBranchUpdate } = require('./scripts/github-actions/update-browser-versions.js')
@@ -73,7 +73,7 @@ jobs:
7373
## Both
7474
- name: Update Browser Versions File
7575
if: ${{ steps.check-need-for-pr.outputs.needs_pr == 'true' || steps.check-need-for-branch-update.outputs.has_newer_update == 'true' }}
76-
uses: actions/github-script@v6
76+
uses: actions/github-script@v7
7777
with:
7878
script: |
7979
const { updateBrowserVersionsFile } = require('./scripts/github-actions/update-browser-versions.js')
@@ -92,7 +92,7 @@ jobs:
9292
## Update available and a branch/PR already exists
9393
- name: Update PR Title
9494
if: ${{ steps.check-need-for-pr.outputs.needs_branch_update == 'true' }}
95-
uses: actions/github-script@v6
95+
uses: actions/github-script@v7
9696
with:
9797
script: |
9898
const { updatePRTitle } = require('./scripts/github-actions/update-browser-versions.js')
@@ -108,7 +108,7 @@ jobs:
108108
- name: Create Pull Request
109109
id: create-pr
110110
if: ${{ steps.check-need-for-pr.outputs.needs_pr == 'true' }}
111-
uses: actions/github-script@v6
111+
uses: actions/github-script@v7
112112
with:
113113
script: |
114114
const { createPullRequest } = require('./scripts/github-actions/create-pull-request.js')

‎.github/workflows/update_v8_snapshot_cache.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
if: ${{ matrix.platform == 'macos-latest' }}
5050
run: echo "SNAPSHOT_FILES='tooling/v8-snapshot/cache/darwin/snapshot-meta.json'" >> $GITHUB_ENV
5151
- name: Checkout
52-
uses: actions/checkout@v3
52+
uses: actions/checkout@v4
5353
with:
5454
fetch-depth: 0
5555
token: ${{ secrets.BOT_GITHUB_ACTION_TOKEN }}
@@ -60,7 +60,7 @@ jobs:
6060
git config --local user.email "${{ env.CYPRESS_BOT_APP_ID }}+cypress-bot[bot]@users.noreply.github.com"
6161
git config --local user.name "cypress-bot[bot]"
6262
- name: Set up Node.js
63-
uses: actions/setup-node@v3
63+
uses: actions/setup-node@v4
6464
with:
6565
node-version: 18
6666
cache: 'yarn'
@@ -122,7 +122,7 @@ jobs:
122122
# PR needs to be created
123123
- name: Create Pull Request
124124
if: ${{ steps.check-need-for-pr.outputs.needs_pr == 'true' }}
125-
uses: actions/github-script@v6
125+
uses: actions/github-script@v7
126126
with:
127127
script: |
128128
const { createPullRequest } = require('./scripts/github-actions/create-pull-request.js')

‎.github/workflows/upload_release_asset.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1616
steps:
1717
- name: Check out repository code
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4
1919
- name: Download Fossa binary and install
2020
# This step utilizes a curl of the latest install pkg from Fossa. Using a git action from
2121
# Fossa doesn't produce the SBOM artifact needed. This manual approach is the only way to

‎browser-versions.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"chrome:beta": "122.0.6261.18",
3-
"chrome:stable": "121.0.6167.139",
2+
"chrome:beta": "122.0.6261.29",
3+
"chrome:stable": "121.0.6167.160",
44
"chrome:minimum": "64.0.3282.0"
55
}

‎packages/app/cypress/e2e/cypress-in-cypress.cy.ts

+5-8
Original file line numberDiff line numberDiff line change
@@ -198,10 +198,8 @@ describe('Cypress in Cypress', { viewportWidth: 1500, defaultCommandTimeout: 100
198198
cy.get('[data-cy="select-browser"]').as('selectBrowser')
199199

200200
cy.viewport(500, 600)
201-
cy.get('@selectBrowser')
202-
.should('not.be.visible')
203-
.scrollIntoView()
204-
.should('be.visible') // with no specs list open, we should see this by scrolling
201+
cy.get('@selectBrowser').scrollIntoView()
202+
cy.get('@selectBrowser').should('be.visible') // with no specs list open, we should see this by scrolling
205203

206204
dragHandleToClientX('panel2', 200).then(() => {
207205
cy.contains('Chrome 1').should('be.visible')
@@ -210,10 +208,9 @@ describe('Cypress in Cypress', { viewportWidth: 1500, defaultCommandTimeout: 100
210208
cy.contains('[aria-controls=reporter-inline-specs-list]', 'Specs')
211209
.click({ force: true })
212210

213-
cy.get('@selectBrowser')
214-
.should('not.be.visible')
215-
.scrollIntoView()
216-
.should('not.be.visible') // with specs list open, scrolling is not enough to see this
211+
cy.get('@selectBrowser').should('not.be.visible')
212+
cy.get('@selectBrowser').scrollIntoView()
213+
cy.get('@selectBrowser').should('not.be.visible') // with specs list open, scrolling is not enough to see this
217214

218215
dragHandleToClientX('panel1', 130)
219216
cy.get('@selectBrowser')

‎packages/driver/cypress/e2e/cypress/cypress.cy.js

-90
Original file line numberDiff line numberDiff line change
@@ -86,96 +86,6 @@ describe('driver/src/cypress/index', () => {
8686
})
8787
})
8888

89-
context('.currentRetry', () => {
90-
describe('test is not retried', () => {
91-
before(() => {
92-
expect(Cypress.currentRetry).to.eq(0)
93-
})
94-
95-
beforeEach(() => {
96-
expect(Cypress.currentRetry).to.eq(0)
97-
})
98-
99-
afterEach(() => {
100-
expect(Cypress.currentRetry).to.eq(0)
101-
})
102-
103-
after(() => {
104-
expect(Cypress.currentRetry).to.eq(0)
105-
})
106-
107-
it('correctly returns currentRetry', () => {
108-
expect(Cypress.currentRetry).to.eq(0)
109-
})
110-
})
111-
112-
describe('test is retried due to beforeEach hook failure', { retries: 1 }, () => {
113-
before(() => {
114-
expect(Cypress.currentRetry).to.be.oneOf([0, 1])
115-
})
116-
117-
beforeEach(() => {
118-
expect(Cypress.currentRetry).to.eq(1)
119-
})
120-
121-
it('correctly returns currentRetry', () => {
122-
expect(Cypress.currentRetry).to.eq(1)
123-
})
124-
125-
afterEach(() => {
126-
expect(Cypress.currentRetry).to.eq(1)
127-
})
128-
129-
after(() => {
130-
expect(Cypress.currentRetry).to.eq(1)
131-
})
132-
})
133-
134-
describe('test is retried due to test failure', { retries: 1 }, () => {
135-
before(() => {
136-
expect(Cypress.currentRetry).to.be.oneOf([0, 1])
137-
})
138-
139-
beforeEach(() => {
140-
expect(Cypress.currentRetry).to.be.oneOf([0, 1])
141-
})
142-
143-
it('correctly returns currentRetry', () => {
144-
expect(Cypress.currentRetry).to.eq(1)
145-
})
146-
147-
afterEach(() => {
148-
expect(Cypress.currentRetry).to.eq(1)
149-
})
150-
151-
after(() => {
152-
expect(Cypress.currentRetry).to.eq(1)
153-
})
154-
})
155-
156-
describe('test is retried due to afterEach hook failure', { retries: 1 }, () => {
157-
before(() => {
158-
expect(Cypress.currentRetry).to.be.oneOf([0, 1])
159-
})
160-
161-
beforeEach(() => {
162-
expect(Cypress.currentRetry).to.be.oneOf([0, 1])
163-
})
164-
165-
it('correctly returns currentRetry', () => {
166-
expect(Cypress.currentRetry).to.be.oneOf([0, 1])
167-
})
168-
169-
afterEach(() => {
170-
expect(Cypress.currentRetry).to.eq(1)
171-
})
172-
173-
after(() => {
174-
expect(Cypress.currentRetry).to.eq(1)
175-
})
176-
})
177-
})
178-
17989
context('.isCy', () => {
18090
it('returns true on cy, cy chainable', () => {
18191
expect(Cypress.isCy(cy)).to.be.true

‎packages/driver/cypress/e2e/e2e/origin/origin.cy.ts

-63
Original file line numberDiff line numberDiff line change
@@ -154,69 +154,6 @@ describe('cy.origin', { browser: '!webkit' }, () => {
154154
cy.log('after cy.origin')
155155
})
156156

157-
;[{
158-
title: 'first attempt',
159-
retries: 0,
160-
}, {
161-
title: 'on retry',
162-
retries: 1,
163-
}].forEach(({ title, retries }) => {
164-
it(`passes runnable state to the secondary origin ${title}`, { retries }, () => {
165-
const runnable = cy.state('runnable')
166-
const expectedRunnable = {
167-
clearTimeout: null,
168-
isPending: null,
169-
resetTimeout: null,
170-
timeout: null,
171-
id: runnable.id,
172-
_currentRetry: retries,
173-
_timeout: 4000,
174-
type: 'test',
175-
title: `passes runnable state to the secondary origin ${title}`,
176-
titlePath: [
177-
'cy.origin',
178-
'withBeforeEach',
179-
`passes runnable state to the secondary origin ${title}`,
180-
],
181-
parent: {
182-
id: runnable.parent.id,
183-
type: 'suite',
184-
title: 'withBeforeEach',
185-
titlePath: [
186-
'withBeforeEach',
187-
],
188-
parent: {
189-
id: runnable.parent.parent.id,
190-
type: 'suite',
191-
title: '',
192-
titlePath: undefined,
193-
ctx: {},
194-
},
195-
ctx: {},
196-
},
197-
ctx: {},
198-
}
199-
200-
cy.origin('http://www.foobar.com:3500', { args: expectedRunnable }, (expectedRunnable) => {
201-
const actualRunnable = cy.state('runnable')
202-
203-
expect(actualRunnable.titlePath()).to.deep.equal(expectedRunnable.titlePath)
204-
expectedRunnable.titlePath = actualRunnable.titlePath
205-
206-
expect(actualRunnable.title).to.equal(expectedRunnable.title)
207-
expect(actualRunnable.id).to.equal(expectedRunnable.id)
208-
expect(actualRunnable.ctx).to.deep.equal(expectedRunnable.ctx)
209-
expect(actualRunnable._currentRetry).to.equal(expectedRunnable._currentRetry)
210-
expect(actualRunnable._timeout).to.equal(expectedRunnable._timeout)
211-
expect(actualRunnable.type).to.equal(expectedRunnable.type)
212-
expect(actualRunnable.callback).to.exist
213-
expect(actualRunnable.timeout).to.exist
214-
expect(actualRunnable.parent.title).to.equal(expectedRunnable.parent.title)
215-
expect(actualRunnable.parent.type).to.equal(expectedRunnable.parent.type)
216-
})
217-
})
218-
})
219-
220157
it('handles querying nested elements', () => {
221158
cy.origin('http://www.foobar.com:3500', () => {
222159
cy

0 commit comments

Comments
 (0)