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 dev into feat protocol #26909

Merged
merged 27 commits into from
Jun 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 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
99b2dcb
Merge branch 'develop' into matth/chore/merge-dev-into-feat-protocol
mjhenkes Jun 1, 2023
fa80bc1
fix yarn lock
mjhenkes Jun 1, 2023
004067e
Trying this....
mjhenkes Jun 1, 2023
b2829fc
fix tests?
mjhenkes Jun 1, 2023
b75b4d5
update snapshot text
mjhenkes Jun 1, 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
21 changes: 4 additions & 17 deletions .circleci/workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -757,7 +757,7 @@ commands:
command:
description: Test command to run to start Cypress tests
type: string
default: "yarn cypress:run"
default: "CYPRESS_INTERNAL_ENABLE_TELEMETRY=1 CYPRESS_RECORD_KEY=$MAIN_RECORD_KEY CYPRESS_PROJECT_ID=ypt4pf yarn cypress:run"
# if the repo to clone and test is a monorepo, you can
# run tests inside a specific subfolder
folder:
Expand Down Expand Up @@ -827,7 +827,7 @@ commands:
name: Run tests using browser "<<parameters.browser>>"
working_directory: /tmp/<<parameters.repo>>/<<parameters.folder>>
command: |
<<parameters.command>> -- --browser <<parameters.browser>>
<<parameters.command>> --browser <<parameters.browser>> --record false
- unless:
condition: <<parameters.browser>>
steps:
Expand All @@ -844,7 +844,7 @@ commands:
- run:
name: Run tests using browser "<<parameters.browser>>"
working_directory: /tmp/<<parameters.repo>>
command: <<parameters.command>> -- --browser <<parameters.browser>>
command: <<parameters.command>> --browser <<parameters.browser>> --record false
- unless:
condition: <<parameters.browser>>
steps:
Expand Down Expand Up @@ -1949,20 +1949,6 @@ jobs:
command: yarn workspace @cypress/mount-utils build
- store-npm-logs

npm-xpath:
<<: *defaults
resource_class: small
steps:
- restore_cached_workspace
- run:
name: Run tests
command: yarn workspace @cypress/xpath cy:run
- store_test_results:
path: npm/xpath/test_results
- store_artifacts:
path: npm/xpath/test_results
- store-npm-logs

npm-grep:
<<: *defaults
resource_class: small
Expand Down Expand Up @@ -2772,6 +2758,7 @@ linux-x64-workflow: &linux-x64-workflow
requires:
- create-build-artifacts
- test-binary-against-cypress-realworld-app:
context: test-runner:cypress-record-key
<<: *mainBuildFilters
requires:
- create-build-artifacts
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/stale_issues_and_pr_cleanup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
max-operations-per-run:
description: 'max operations per run'
required: false
default: 800
default: 3000
days-before-stale:
description: 'days-before-stale'
required: false
Expand All @@ -32,8 +32,8 @@ permissions:
issues: write
pull-requests: write
env:
DEFAULT_DEBUG_ONLY: true
DEFAULT_MAX_OPS: 800
DEFAULT_DEBUG_ONLY: false
DEFAULT_MAX_OPS: 3000
DEFAULT_DAYS_BEFORE_STALE: 180
DEFAULT_DAYS_BEFORE_CLOSE: 14
DEFAULT_EXEMPT_ISSUE_LABELS: 'type: feature,type: enhancement,routed-to-e2e,routed-to-ct,routed-to-tools,routed-to-cloud,prevent-stale,triaged'
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/triage_add_to_project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ on:
secrets:
ADD_TO_TRIAGE_BOARD_TOKEN:
required: true
TRIAGE_BOARD_TOKEN:
required: true
WORKFLOW_DEPLOY_KEY:
required: true
issues:
types:
- opened
Expand Down
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,6 @@ system-tests/lib/fixtureDirs.ts
# from npm/webpack-dev-server
/npm/webpack-dev-server/cypress/videos

# from npm/xpath
/npm/xpath/cypress/videos
# from npm/grep
/npm/grep/cypress/videos

Expand Down
1 change: 0 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,3 @@
- [`@cypress/webpack-batteries-included-preprocessor`](https://github.com/cypress-io/cypress/blob/develop/npm/webpack-batteries-included-preprocessor/CHANGELOG.md)
- [`@cypress/webpack-dev-server`](https://github.com/cypress-io/cypress/blob/develop/npm/webpack-dev-server/CHANGELOG.md)
- [`@cypress/webpack-preprocessor`](https://github.com/cypress-io/cypress/blob/develop/npm/webpack-preprocessor/CHANGELOG.md)
- [`@cypress/xpath`](https://github.com/cypress-io/cypress/blob/develop/npm/xpath/CHANGELOG.md)
1 change: 0 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,6 @@ Here is a list of the npm packages in this repository:
| [webpack-batteries-included-preprocessor](./npm/webpack-batteries-included-preprocessor) | `@cypress/webpack-batteries-included-preprocessor` | Cypress preprocessor for bundling JavaScript via webpack with dependencies included and support for various ES features, TypeScript, and CoffeeScript. |
| [webpack-dev-server](./npm/webpack-dev-server) | `@cypress/webpack-dev-server` | Webpack powered dev server for Component Testing. |
| [webpack-preprocessor](./npm/webpack-preprocessor) | `@cypress/webpack-preprocessor` | Cypress preprocessor for bundling JavaScript via webpack. |
| [xpath](./npm/xpath) | `@cypress/xpath` | Adds XPath command to Cypress.io test runner |

We try to tag all issues with a `pkg/` or `npm/` tag describing the appropriate package the work is required in. For public packages, we use their qualified package name: For example, issues relating to the webpack preprocessor are tagged under [`npm: @cypress/webpack-preprocessor`](https://github.com/cypress-io/cypress/labels/npm%3A%20%40cypress%2Fwebpack-preprocessor) label and issues related to the `driver` package are tagged with the [`pkg/driver`](https://github.com/cypress-io/cypress/labels/pkg%2Fdriver) label.

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
<a href="https://www.npmjs.com/package/cypress">
<img src="https://img.shields.io/npm/dm/cypress.svg" alt="npm"/>
</a>
<a href="https://gitter.im/cypress-io/cypress">
<img src="https://img.shields.io/gitter/room/cypress-io/cypress.svg" alt="Gitter chat"/>
<a href="https://on.cypress.io/discord">
<img src="https://img.shields.io/badge/chat-on%20Discord-brightgreen" alt="Discord chat"/>
</a>
<a href="https://stackshare.io/cypress">
<img src="https://img.stackshare.io/misc/follow-on-stackshare-badge.svg" alt="StackShare"/>
Expand Down
13 changes: 10 additions & 3 deletions cli/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,29 @@
<!-- See the ../guides/writing-the-cypress-changelog.md for details on writing the changelog. -->
## 12.12.1
## 12.13.0

_Released 05/23/2023 (PENDING)_
_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).

**Features:**

- Adds a new cloud api that confirms the uploads of artifacts. Addressed in [#26421](https://github.com/cypress-io/cypress/pull/26421).

**Bugfixes:**

- Reverted [#26452](https://github.com/cypress-io/cypress/pull/26630) which introduced a bug that prevents users from using End to End with Yarn 3. Fixed in [#26735](https://github.com/cypress-io/cypress/pull/26735). Fixes [#26676](https://github.com/cypress-io/cypress/issues/26676).
- Reverted [#26452](https://github.com/cypress-io/cypress/pull/26452) which introduced a bug that prevents users from using End to End with Yarn 3. Fixed in [#26735](https://github.com/cypress-io/cypress/pull/26735). Fixes [#26676](https://github.com/cypress-io/cypress/issues/26676).
- Moved `types` condition to the front of `package.json#exports` since keys there are meant to be order-sensitive. Fixed in [#26630](https://github.com/cypress-io/cypress/pull/26630).
- Fixed an issue where newly-installed dependencies would not be detected during Component Testing setup. Addresses [#26685](https://github.com/cypress-io/cypress/issues/26685).
- Fixed a UI regression that was flashing an "empty" state inappropriately when loading the Debug page. Fixed in [#26761](https://github.com/cypress-io/cypress/pull/26761).
- Fixed an issue in Component Testing setup where TypeScript version 5 was not properly detected. Fixes [#26204](https://github.com/cypress-io/cypress/issues/26204).

**Misc:**

- Updated styling & content of Cypress Cloud slideshows when not logged in or no runs have been recorded. Addresses [#26181](https://github.com/cypress-io/cypress/issues/26181).
- Changed the nomenclature of 'processing' to 'compressing' when terminal video output is printed during a run. Addresses [#26657](https://github.com/cypress-io/cypress/issues/26657).
- Changed the nomenclature of 'Upload Results' to 'Uploading Screenshots & Videos' when terminal output is printed during a run. Addresses [#26759](https://github.com/cypress-io/cypress/issues/26759).

## 12.12.0

Expand Down
7 changes: 7 additions & 0 deletions npm/vite-plugin-cypress-esm/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# [@cypress/vite-plugin-cypress-esm-v1.0.1](https://github.com/cypress-io/cypress/compare/@cypress/vite-plugin-cypress-esm-v1.0.0...@cypress/vite-plugin-cypress-esm-v1.0.1) (2023-05-23)


### Bug Fixes

* Vite esm plugin issues ([#26714](https://github.com/cypress-io/cypress/issues/26714)) ([38b9526](https://github.com/cypress-io/cypress/commit/38b952622e034928df0d6e5d571e83c22d98ce86))

# @cypress/vite-plugin-cypress-esm-v1.0.0 (2023-05-04)


Expand Down
14 changes: 0 additions & 14 deletions npm/xpath/.eslintrc

This file was deleted.

3 changes: 0 additions & 3 deletions npm/xpath/.releaserc.js

This file was deleted.

13 changes: 0 additions & 13 deletions npm/xpath/CHANGELOG.md

This file was deleted.

81 changes: 1 addition & 80 deletions npm/xpath/README.md
Original file line number Diff line number Diff line change
@@ -1,82 +1,3 @@
# @cypress/xpath

> Adds XPath command to [Cypress.io](https://www.cypress.io) test runner

## Install with npm

```shell
npm install -D @cypress/xpath
```

## Install with Yarn

```shell
yarn add @cypress/xpath --dev
```

Then include in your project's [support file](https://on.cypress.io/support-file)

```js
require('@cypress/xpath');
```

## Use

After installation your `cy` object will have `xpath` command.

```js
it('finds list items', () => {
cy.xpath('//ul[@class="todo-list"]//li').should('have.length', 3);
});
```

You can also chain `xpath` off of another command.

```js
it('finds list items', () => {
cy.xpath('//ul[@class="todo-list"]').xpath('./li').should('have.length', 3);
});
```

As with other cy commands, it is scoped by `cy.within()`.

```js
it('finds list items', () => {
cy.xpath('//ul[@class="todo-list"]').within(() => {
cy.xpath('./li').should('have.length', 3);
});
});
```

**note:** you can test XPath expressions from DevTools console using `$x(...)` function, for example `$x('//div')` to find all divs.

See [cypress/e2e/spec.cy.js](cypress/e2e/spec.cy.js)

## Beware the XPath // trap

In XPath the expression // means something very specific, and it might not be what you think. Contrary to common belief, // means "anywhere in the document" not "anywhere in the current context". As an example:

```js
cy.xpath('//body').xpath('//script');
```

You might expect this to find all script tags in the body, but actually, it finds all script tags in the entire document, not only those in the body! What you're looking for is the .// expression which means "any descendant of the current node":

```js
cy.xpath('//body').xpath('.//script');
```

The same thing goes for within:

```js
cy.xpath('//body').within(() => {
cy.xpath('.//script');
});
```


For more, see [Intelligent Code Completion](https://on.cypress.io/intellisense)

## License

This project is licensed under the terms of the [MIT license](/LICENSE.md).
> @cypress/xpath has been deprecated and is no longer supported.
12 changes: 0 additions & 12 deletions npm/xpath/cypress.config.js

This file was deleted.

26 changes: 0 additions & 26 deletions npm/xpath/cypress/e2e/index.html

This file was deleted.

Loading