Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: merge develop into feat/protocol #27022

Merged
merged 59 commits into from
Jun 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
6a56c39
chore: add Nx Cloud (#26712)
jordanpowell88 May 18, 2023
a0efc77
feat: update git related messages for runs and debug (#26758)
jordanpowell88 May 19, 2023
eef8cd2
chore: rename video processing events to capture/compress (#26800)
AtofStryker May 19, 2023
f524670
chore: rename upload results to upload screenshots & videos (#26811)
AtofStryker May 22, 2023
6df7a70
chore: capture versions of relevant dependencies with `x-dependencies…
astone123 May 22, 2023
80985c8
chore: update changlelog script to handle revert pr ref (#26801)
emilyrohrbough May 22, 2023
e821f85
fix: Correct typescript scaffold dependency (#26815)
dkasper-was-taken May 22, 2023
32796de
chore: 12.13.0 prep (#26833)
chrisbreiding May 23, 2023
b71788d
chore: 12.13.0 release (#26834)
chrisbreiding May 23, 2023
3df65f7
chore: release @cypress/vite-plugin-cypress-esm-v1.0.1
semantic-release-bot May 23, 2023
58b9ccc
chore: Implement runSpec mutation (#26782)
mike-plummer May 24, 2023
7d06057
chore: replace gitter badge with discord on readme (#26771)
elylucas May 24, 2023
b1f699a
chore: add GraphQL mutation for sending system notifications via Elec…
astone123 May 24, 2023
d91177a
fix: upgrade typescript from 4.7.4 to 4.9.5 (#26826)
snyk-bot May 24, 2023
850973e
test: fix 2 broken tests for Windows (#26854)
warrensplayer May 25, 2023
0cf11fe
Update stale_issues_and_pr_cleanup.yml
May 26, 2023
d34a148
chore(dep): [Snyk] Upgrade vite from 2.9.13 to 2.9.15 (#26830)
snyk-bot May 26, 2023
acc4d5f
Update triage_add_to_project.yml
May 30, 2023
bafabf9
chore: fix minor background color styling in debug results component …
astone123 May 31, 2023
0af6936
Update stale_issues_and_pr_cleanup.yml
Jun 1, 2023
7ef4300
chore: Deprecate @cypress/xpath package (#26893)
jennifer-shehane Jun 1, 2023
3d1ec09
chore: add telemetry realworld app (#26896)
mjhenkes Jun 1, 2023
f3f8f8c
chore(deps): update dependency find-process to v1.4.7 🌟 (#26906)
renovate[bot] Jun 1, 2023
770d262
chore(deps): update dependency firefox-profile to v4.3.2 🌟 (#26912)
renovate[bot] Jun 1, 2023
9c4d5f7
chore: add browser state action for debug (#26884)
dkasper-was-taken Jun 2, 2023
c3e3500
chore: replace gift devDep with simple-git (#26728)
emilyrohrbough Jun 2, 2023
d593487
chore: replace arg devDep with minimist; remove unused shx devDep (#2…
emilyrohrbough Jun 2, 2023
fd63f19
chore: enable caching for lint task (#26791)
jordanpowell88 Jun 2, 2023
bd408f2
chore: remove old performance reporting (#26920)
mjhenkes Jun 2, 2023
ffe4734
chore: update Snyk to scan all projects (#26867)
cypresschris Jun 5, 2023
c1489bd
chore: skip problematic component tests that fail on contributor PRs …
AtofStryker Jun 5, 2023
9721a26
chore: omit unused circle variables that cause contributor PR issues …
AtofStryker Jun 5, 2023
d77341e
chore: make git message warnings remain dismissable (#26812)
jordanpowell88 Jun 5, 2023
4d5f903
chore: replace fast-glob with globby; remove unneeded getenv dep (#26…
emilyrohrbough Jun 5, 2023
084f054
fix: update angular dep min versions (#26908)
jordanpowell88 Jun 5, 2023
2321646
fix: upgrade typescript from 4.2.3 to 4.9.5 (#26858)
snyk-bot Jun 5, 2023
777b4e8
chore: Update v8 snapshot cache (#26762)
github-actions[bot] Jun 5, 2023
25582dd
feat: Implement testing type switch promos (#26894)
mike-plummer Jun 6, 2023
a6bbdc5
chore: release internal-scripts-v1.0.0
semantic-release-bot Jun 6, 2023
1479e53
chore: fix changelog links (#26948)
warrensplayer Jun 6, 2023
f90dda6
chore: 12.14.0 release (#26950)
warrensplayer Jun 6, 2023
d610c51
chore: Update Chrome (stable) to 114.0.5735.106 and Chrome (beta) to …
github-actions[bot] Jun 6, 2023
cada9f7
chore: bump cache version (#26952)
warrensplayer Jun 6, 2023
65fe540
chore: move release date (#26958)
warrensplayer Jun 6, 2023
ef16792
chore(deps): update dependency @antfu/utils to ^0.7.0 [security] (#26…
renovate[bot] Jun 7, 2023
ee72148
chore: fix base error styling (#26954)
astone123 Jun 7, 2023
2263bc5
chore: remove low value percy snapshots (#26934)
jordanpowell88 Jun 7, 2023
89deb44
chore: changelog updates (#26964)
warrensplayer Jun 8, 2023
8d2027a
chore: stabilize side navigation bar during loading and switching tes…
astone123 Jun 8, 2023
0be33b9
fix: log video path if exists, regardless of compression (#26813)
AtofStryker Jun 8, 2023
6b7683e
feat: allow users to pass true to videoCompression config and only a……
AtofStryker Jun 8, 2023
806b74e
chore: adding new kpi report workflow (#26922)
Jun 9, 2023
5b27edd
feat: chrome headless new (#26481)
mjhenkes Jun 9, 2023
d2ca58a
dependency: remove cypress/mocha-teamcity-reporter (#26938)
jennifer-shehane Jun 9, 2023
0d26b0f
chore: increase timeout of cy.readFile to address flaky WebKit test (…
jennifer-shehane Jun 9, 2023
be12245
chore: fix windows CI regressions (#27001)
lmiller1990 Jun 12, 2023
3fc17c2
chore(data-context): update runSpec mutation to support absolute spec…
jordanpowell88 Jun 13, 2023
398fe4d
chore(deps): upgrade esbuild in system-test from 0.14.53 to 0.17.19 (…
snyk-bot Jun 13, 2023
98a0f4f
Merge branch 'develop' into feat/protocol
AtofStryker Jun 13, 2023
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
2 changes: 1 addition & 1 deletion .circleci/cache-version.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Bump this version to force CI to re-create the cache from scratch.

05-10-22
06-07-23
21 changes: 6 additions & 15 deletions .circleci/workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -287,9 +287,6 @@ commands:
name: Restore cache state, to check for known modules cache existence
keys:
- v{{ checksum ".circleci/cache-version.txt" }}-{{ checksum "platform_key" }}-state-of-system-tests-projects-node-modules-cache-{{ checksum "system_tests_cache_key" }}
- run:
name: Send root honeycomb event for this CI build
command: cd system-tests/scripts && node ./send-root-honeycomb-event.js
- run:
name: Bail if specific cache exists
command: |
Expand Down Expand Up @@ -581,14 +578,15 @@ commands:
# To make `circleci tests` work correctly, we need to step into the package folder.
cd packages/<<parameters.package>>

GLOB="cypress/e2e/**/*cy.*"

if [[ <<parameters.type>> == 'ct' ]]; then
# component tests are located side by side with the source codes.
GLOB="src/**/*cy.*"
# for the app component tests, ignore specs that are known to cause failures on contributor PRs (see https://discuss.circleci.com/t/how-to-exclude-certain-files-from-circleci-test-globbing/41028)
TESTFILES=$(find src -regextype posix-extended -name '*.cy.*' -not -regex '.*(FileMatch|PromoAction|SelectorPlayground).cy.*' | circleci tests split --total=$CIRCLE_NODE_TOTAL)
else
GLOB="cypress/e2e/**/*cy.*"
TESTFILES=$(circleci tests glob "$GLOB" | circleci tests split --total=$CIRCLE_NODE_TOTAL)
fi

TESTFILES=$(circleci tests glob "$GLOB" | circleci tests split --total=$CIRCLE_NODE_TOTAL)
echo "Test files for this machine are $TESTFILES"

# To run the `yarn` command, we need to walk out of the package folder.
Expand Down Expand Up @@ -2041,20 +2039,13 @@ jobs:
command: rm -rf cypress.json
- run:
name: Install prod dependencies
command: yarn --production
command: yarn --production --ignore-engines
working_directory: /tmp/cypress-example-kitchensink
- run:
name: Example server
command: yarn start
working_directory: /tmp/cypress-example-kitchensink
background: true
- run:
name: Rename support file
working_directory: /tmp/cypress-example-kitchensink
command: |
if [[ -f cypress/support/index.js ]]; then
mv cypress/support/index.js cypress/support/e2e.js
fi
- run:
name: Run Kitchensink example project
command: |
Expand Down
1 change: 0 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ module.exports = {
rules: {
'no-restricted-properties': 'off',
'no-restricted-syntax': 'off',
'no-console': 'off',
},
},
],
Expand Down
71 changes: 71 additions & 0 deletions .github/workflows/report_weekly_app_kpis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
name: 'KPI Report Generation'
on:
# makes this workflow reusable
workflow_call:
secrets:
TRIAGE_BOARD_TOKEN:
required: true

workflow_dispatch:
inputs:
start-date:
description: 'Beginning date of query (ex. 2023-06-01)'
required: false
end-date:
description: 'Ending date of query (ex. 2023-06-01)'
required: false
default-other-repos:
description: "Comma separated list of repos you want to query"
required: false
default: '["cypress-documentation", "circleci-orb", "github-action", "cypress-docker-images", "cypress-chrome-recorder-extension", "cypress-chrome-recorder", "cypress-recorder-extension", "cypress-example-kitchensink", "cypress-origin-providers", "release-automations", "cypress-test-tiny", "eslint-plugin-cypress", "netlify-plugin-cypress", "cypress-support-internal", "cypress-realworld-app", "code-coverage"]'
default-mono-repo:
description: "The Cypress mono repo"
required: false
default: '["cypress"]'

schedule:
- cron: '0 18 * * 5' # this will run weekly on Friday at 2PM EST (the github workflow runners are on UTC)

jobs:
run-kpi-reporting:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
with:
repository: 'cypress-io/release-automations'
ref: 'master'
ssh-key: ${{ secrets.WORKFLOW_DEPLOY_KEY }}
- name: Set up Node.js
uses: actions/setup-node@v3
with:
node-version: 'lts/*'
- name: Generate Non-mono Repo Open / Closed KPIs
uses: actions/github-script@v6
env:
DEFAULT_REPOS: ${{ github.event.inputs.default-other-repos || '["cypress-documentation", "circleci-orb", "github-action", "cypress-docker-images", "cypress-chrome-recorder-extension", "cypress-chrome-recorder", "cypress-recorder-extension", "cypress-example-kitchensink", "cypress-origin-providers", "release-automations", "cypress-test-tiny", "eslint-plugin-cypress", "netlify-plugin-cypress", "cypress-support-internal", "cypress-realworld-app", "code-coverage"]' }}
with:
github-token: ${{ secrets.TRIAGE_BOARD_TOKEN }}
script: |
const script = require('./scripts/reports/open-vs-closed-issues.js')
await script.getOpenAndClosedIssueMetrics(github, context, ${{ env.DEFAULT_REPOS }});
- name: Generate Cypress Mono Repo Open / Closed KPIs
uses: actions/github-script@v6
env:
DEFAULT_MONO_REPO: ${{ github.event.inputs.default-mono-repo || '["cypress"]' }}
with:
github-token: ${{ secrets.TRIAGE_BOARD_TOKEN }}
script: |
const script = require('./scripts/reports/open-vs-closed-issues.js')
await script.getOpenAndClosedIssueMetrics(github, context, ${{ env.DEFAULT_MONO_REPO }});
- name: Generate Triage Throughput KPIs
uses: actions/github-script@v6
env:
START_DATE: ${{ github.event.inputs.start-date }}
END_DATE: ${{ github.event.inputs.end-date }}
PROJECT_BOARD_NUMBER: 9
with:
github-token: ${{ secrets.TRIAGE_BOARD_TOKEN }}
script: |
const script = require('./scripts/reports/triage_throughput_kpis.js')
await script.getTriageIssueMetrics(github, context, "${{ env.START_DATE }}", "${{ env.END_DATE }}", "${{ env.PROJECT_BOARD_NUMBER }}");
2 changes: 1 addition & 1 deletion .github/workflows/snyk_sca_scan.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ jobs:
- name: Perform SCA Scan
continue-on-error: false
run: |
snyk test --yarn-workspaces --strict-out-of-sync=false --detection-depth=6 --exclude=docker,Dockerfile --severity-threshold=critical
snyk test --all-projects --strict-out-of-sync=false --detection-depth=6 --exclude=docker,Dockerfile --severity-threshold=critical
env:
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
114 changes: 0 additions & 114 deletions .github/workflows/triage_issue_metrics.yml

This file was deleted.

4 changes: 2 additions & 2 deletions browser-versions.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"chrome:beta": "113.0.5672.63",
"chrome:stable": "112.0.5615.165",
"chrome:beta": "115.0.5790.13",
"chrome:stable": "114.0.5735.106",
"chrome:minimum": "64.0.3282.0"
}
39 changes: 33 additions & 6 deletions cli/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,24 +1,51 @@
<!-- See the ../guides/writing-the-cypress-changelog.md for details on writing the changelog. -->
## 12.13.1
## 12.15.0

_Released 06/06/2023 (PENDING)_
_Released 06/20/2023 (PENDING)_

**Features:**

- Added support for running Cypress tests with [Chrome's new `--headless=new` flag](https://developer.chrome.com/articles/new-headless/). Chrome versions 112 and above will now be run in the `headless` mode that matches the `headed` browser implementation. Addresses [#25972](https://github.com/cypress-io/cypress/issues/25972).
- The [`videoCompression`](https://docs.cypress.io/guides/references/configuration#Videos) configuration option now accepts both a boolean or a Constant Rate Factor (CRF) number between `1` and `51`. The `videoCompression` default value is still `32` CRF and when `videoCompression` is set to `true` the default of `32` CRF will be used. Addresses [#26658](https://github.com/cypress-io/cypress/issues/26658).

**Bugfixes:**

- Fixed an issue where video output was not being logged to the console when `videoCompression` was turned off. Videos will now log to the terminal regardless of the compression value. Addresses [#25945](https://github.com/cypress-io/cypress/issues/25945).

**Dependency Updates:**

- Upgraded [`find-process`](https://www.npmjs.com/package/find-process) from `1.4.1` to `1.4.7` to address this [Synk](https://security.snyk.io/vuln/SNYK-JS-FINDPROCESS-1090284) security vulnerability. Addressed in [#26631](https://github.com/cypress-io/cypress/pull/26906).
- Upgraded [`firefox-profile`](https://www.npmjs.com/package/firefox-profile) from `4.0.0` to `4.3.2` to address security vulnerabilities within sub-dependencies. Addressed in [#26631](https://github.com/cypress-io/cypress/pull/26912).
- Removed [`@cypress/mocha-teamcity-reporter`](https://www.npmjs.com/package/@cypress/mocha-teamcity-reporter) as this package was no longer being referenced. Addressed in [#26938](https://github.com/cypress-io/cypress/pull/26938).

## 12.14.0

_Released 06/07/2023_

**Features:**

- Adds a new cloud api that confirms the uploads of artifacts. Addressed in [#26421](https://github.com/cypress-io/cypress/pull/26421).
- A new testing type switcher has been added to the Spec Explorer to make it easier to move between E2E and Component Testing. An informational overview of each type is displayed if it hasn't already been configured to help educate and onboard new users to each testing type. Addresses [#26448](https://github.com/cypress-io/cypress/issues/26448), [#26836](https://github.com/cypress-io/cypress/issues/26836) and [#26837](https://github.com/cypress-io/cypress/issues/26837).

**Bugfixes:**

- Fixed an issue to now correctly detect Angular 16 dependencies
([@angular/cli](https://www.npmjs.com/package/@angular/cli),
[@angular-devkit/build-angular](https://www.npmjs.com/package/@angular-devkit/build-angular),
[@angular/core](https://www.npmjs.com/package/@angular/core), [@angular/common](https://www.npmjs.com/package/@angular/common),
[@angular/platform-browser-dynamic](https://www.npmjs.com/package/@angular/platform-browser-dynamic))
during Component Testing onboarding. Addresses [#26852](https://github.com/cypress-io/cypress/issues/26852).
- Ensures Git-related messages on the [Runs page](https://docs.cypress.io/guides/core-concepts/cypress-app#Runs) remain dismissed. Addresses [#26808](https://github.com/cypress-io/cypress/issues/26808).

**Dependency Updates:**

- Upgraded [`find-process`](https://www.npmjs.com/package/find-process) from `1.4.1` to `1.4.7` to address this [Synk](https://security.snyk.io/vuln/SNYK-JS-FINDPROCESS-1090284) security vulnerability. Addressed in [#26906](https://github.com/cypress-io/cypress/pull/26906).
- Upgraded [`firefox-profile`](https://www.npmjs.com/package/firefox-profile) from `4.0.0` to `4.3.2` to address security vulnerabilities within sub-dependencies. Addressed in [#26912](https://github.com/cypress-io/cypress/pull/26912).

## 12.13.0

_Released 05/23/2023_

**Features:**

- Adds Git-related messages for the [Runs page](https://docs.cypress.io/guides/core-concepts/cypress-app#Runs) and [Debug page](https://docs.cypress.io/guides/cloud/runs#Debug) when users aren't using Git or there are no recorded runs for the current branch. Fixes [#26680](https://github.com/cypress-io/cypress/issues/26680).
- Adds Git-related messages for the [Runs page](https://docs.cypress.io/guides/core-concepts/cypress-app#Runs) and [Debug page](https://docs.cypress.io/guides/cloud/runs#Debug) when users aren't using Git or there are no recorded runs for the current branch. Addresses [#26680](https://github.com/cypress-io/cypress/issues/26680).

**Bugfixes:**

Expand Down
8 changes: 8 additions & 0 deletions cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,15 @@
"devDependencies": {
"@babel/cli": "7.13.0",
"@babel/preset-env": "7.13.5",
"@cypress/angular": "0.0.0-development",
"@cypress/grep": "0.0.0-development",
"@cypress/mount-utils": "0.0.0-development",
"@cypress/react": "0.0.0-development",
"@cypress/react18": "0.0.0-development",
"@cypress/sinon-chai": "2.9.1",
"@cypress/svelte": "0.0.0-development",
"@cypress/vue": "0.0.0-development",
"@cypress/vue2": "0.0.0-development",
"@packages/root": "0.0.0-development",
"@types/bluebird": "3.5.33",
"@types/chai": "4.2.15",
Expand Down
7 changes: 5 additions & 2 deletions cli/types/cypress.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3004,10 +3004,13 @@ declare namespace Cypress {
*/
trashAssetsBeforeRuns: boolean
/**
* The quality setting for the video compression, in Constant Rate Factor (CRF). The value can be false to disable compression or a value between 0 and 51, where a lower value results in better quality (at the expense of a higher file size).
* The quality setting for the video compression, in Constant Rate Factor (CRF).
* Enable compression by passing true to use the default CRF of 32.
* Compress at custom CRF by passing a number between 1 and 51, where a lower value results in better quality (at the expense of a higher file size).
* Disable compression by passing false or 0.
* @default 32
*/
videoCompression: number | false
videoCompression: number | boolean
/**
* Whether Cypress will record a video of the test run when running headlessly.
* @default true
Expand Down
2 changes: 1 addition & 1 deletion cli/types/tests/plugins-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const pluginConfig2: Cypress.PluginConfig = (on, config) => {
config.configFile // $ExpectType string
config.fixturesFolder // $ExpectType string | false
config.screenshotsFolder // $ExpectType string | false
config.videoCompression // $ExpectType number | false
config.videoCompression // $ExpectType number | boolean
config.projectRoot // $ExpectType string
config.version // $ExpectType string
config.testingType // $ExpectType TestingType
Expand Down
3 changes: 2 additions & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"packages/*",
"npm/*",
"tooling/*",
"system-tests"
"system-tests",
"scripts"
],
"useWorkspaces": true,
"useNx": true,
Expand Down
1 change: 1 addition & 0 deletions npm/angular/src/mount.ts
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ export type MountResponse<T> = {
// 'zone.js/testing' is not properly aliasing `it.skip` but it does provide `xit`/`xspecify`
// Written up under https://github.com/angular/angular/issues/46297 but is not seeing movement
// so we'll patch here pending a fix in that library
// @ts-ignore Ignore so that way we can bypass semantic error TS7017: Element implicitly has an 'any' type because type 'typeof globalThis' has no index signature.
globalThis.it.skip = globalThis.xit

@Injectable()
Expand Down
Loading