Skip to content
Merged

Develop #2026

Show file tree
Hide file tree
Changes from all commits
Commits
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 source/api/plugins/browser-launch-api.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ module.exports = (on, config) => {
// }

if (browser.name === 'chrome') {
// `args` is an araay of all the arguments
// `args` is an array of all the arguments
// that will be passed to Chrome when it launchers
args.push('--start-fullscreen')

Expand Down
2 changes: 1 addition & 1 deletion source/guides/core-concepts/introduction-to-cypress.md
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ cy

```js
cy
// cy.get() looks for '#my-nonexistent-selector', repeating the query until...
// cy.get() looks for '#element-does-not-exist', repeating the query until...
// ...it doesn't find the element before its timeout.
// Cypress halts and fails the test.
.get('#element-does-not-exist')
Expand Down
18 changes: 9 additions & 9 deletions source/guides/dashboard/github-integration.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ GitHub Enterprise is currently not supported. Please [contact us](mailto:hello@c
GitHub Integration is dependent on your CI environment reliably providing commit SHA data (typically via an environment variable). This is not a problem for most users, but if you are facing GitHub integration issues with your CI setup, please make sure the git information is being sent properly by following {% url "these guidelines" continuous-integration#Git-information %}. If you are still facing issues after this, please [contact us](mailto:[email protected]).
{% endnote %}

## Install the Cypress GitHub app
# Install the Cypress GitHub app

Before you can enable GitHub integration for your Cypress projects, you must first install the Cypress GitHub App. You can start the GitHub App installation process via your organization's settings page or a project's settings page in the {% url "Cypress Dashboard" https://on.cypress.io/dashboard %}.

### Install via organization integration settings
## Install via organization integration settings

1. Go to the Dashboard {% url "Organizations page" https://dashboard.cypress.io/#/organizations %}.
2. Select the organization you wish to integrate with a GitHub account or GitHub organization.
Expand All @@ -26,7 +26,7 @@ Before you can enable GitHub integration for your Cypress projects, you must fir
4. Click the **Install the Cypress GitHub App** button.
{% imgTag /img/dashboard/github-integration/install-github-integration-with-cypress-from-org-settings.jpg "Install Cypress GitHub App from Integrations" %}

### Install via project settings
## Install via project settings

1. Go to your organization's projects page.
2. Select the project you wish to integrate with a GitHub repository.
Expand All @@ -37,7 +37,7 @@ Before you can enable GitHub integration for your Cypress projects, you must fir
5. Click the **Install the Cypress GitHub App** button.
{% imgTag /img/dashboard/github-integration/install-github-cypress-app-project-settings.jpg "Install GitHub Cypress App" %}

### Cypress GitHub app installation process
## Cypress GitHub app installation process

Once you've started the GitHub App installation process {% urlHash "via a Cypress organization's settings" Install-via-organization-integration-settings %} or {% urlHash "a project's settings" Install-via-project-settings %}, you will be directed to GitHub.com to complete the installation:

Expand All @@ -56,7 +56,7 @@ Once you've started the GitHub App installation process {% urlHash "via a Cypres

3. Click the **Install** button to complete the installation.

## Enabling GitHub integration for a project
# Enabling GitHub integration for a project

After completing the Cypress GitHub App installation for your organization you can now enable GitHub Integration for *any* Cypress project.

Expand All @@ -77,7 +77,7 @@ Once a GitHub repository is associated with a Cypress project, the GitHub integr
You can also see all GitHub Integration enabled Cypress projects within your organizations **Integrations** page:
{% imgTag /img/dashboard/github-integration/org-settings-with-projects.png "Integrations page" "no-border" %}

## Status checks
# Status checks

If status checks are enabled within a project's GitHub integration settings, the Cypress Dashboard will report Cypress test statuses to GitHub for related commits. {% url "Status checks" https://help.github.com/en/articles/about-status-checks %} help prevent merging a commit or pull-request into the rest of your codebase until all your Cypress tests have passed.

Expand All @@ -92,12 +92,12 @@ The Cypress GitHub App reports commit status checks in two separate styles:
Each status check will report the number of test failures or passes, and the associated **Details** link will direct you to the test run's page within the Cypress Dashboard to help you dig deeper into the problem via error messages, stack traces, screenshots, and video recordings:
{% imgTag /img/dashboard/dashboard-fail-tab.png "Cypress Dashboard failure tab" %}

### Disable status checks
## Disable status checks

GitHub status checks are optional, and can be disabled within a project's GitHub integration settings:
{% imgTag /img/dashboard/github-integration/status-check-settings.png "Status checks settings" %}

## Pull request comments
# Pull request comments

The Cypress GitHub App can provide detailed test information within pull requests via comments that include:

Expand All @@ -117,7 +117,7 @@ An example of a Cypress pull-request comment can be seen below:

{% imgTag /img/dashboard/github-integration/pr-comment-fail.jpg "Cypress GitHub App PR comment" %}

### Disable PR comments
## Disable PR comments

PR comments and failure screenshot thumbnails are optional, and can be disabled if not needed within a project's GitHub Integration settings:
{% imgTag /img/dashboard/github-integration/pr-comments-settings.png "Status checks settings" %}
2 changes: 1 addition & 1 deletion source/guides/guides/module-api.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Option | Type | Description
`group` | *String* | {% url "Group" parallelization#Grouping-test-runs %} recorded tests together under a single run
`headed` | *Boolean* | Display the Electron browser instead of running headlessly
`key` | *String* | Specify your secret record key
`noExit` | *Boolean* | Keep Cypress open after all tests run
`exit` | *Boolean* | Whether to close Cypress after all tests run
`parallel` | *Boolean* | Run recorded specs in {% url "parallel" parallelization %} across multiple machines
`port` | *Number* | Override default port
`project` | *String* | Path to a specific project
Expand Down
2 changes: 1 addition & 1 deletion source/guides/overview/why-cypress.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ We want to help developers build a new generation of modern applications faster,

We know that in order for us to be successful we must enable, nurture, and foster an ecosystem that thrives on open source. Every line of test code is an investment in **your codebase**, it will never be coupled to us as a paid service or company. Tests will be able to run and work independently, *always*.

We believe testing needs a lot of {% fa fa-heart %} and we are here to build a tool, a service, and a community that everyone can learn and benefit from. We're solving the hardest pain points shared by every developer working on the web. We believe in this mission and hope that you will join us to make Cypress a lasting ecosystem that helps everyone happy.
We believe testing needs a lot of {% fa fa-heart %} and we are here to build a tool, a service, and a community that everyone can learn and benefit from. We're solving the hardest pain points shared by every developer working on the web. We believe in this mission and hope that you will join us to make Cypress a lasting ecosystem that makes everyone happy.

# Features

Expand Down
2 changes: 1 addition & 1 deletion source/zh-cn/guides/references/trade-offs.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ containerClass: faq
- Cypress不是一般的{% urlHash "自动化工具" 自动化限制 %}
- Cypress命令{% urlHash "在浏览器内" 在浏览器内 %}运行
- 永远不会支持{% urlHash "多页签浏览" 多页签 %}
- 你无法使用Cypress同时驱动{% urlHash "两个浏览器在同一时间" 同一时间打开多浏览器 %}
- 你无法使用 Cypress {% urlHash "同时驱动两个或以上浏览器" 同一时间打开多浏览器 %}
- 每个测试都绑定到{% urlHash "单个域名后缀" 同域 %}

### 临时"缺陷":
Expand Down
2 changes: 1 addition & 1 deletion themes/cypress/source/css/_partial/sidebar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
left: 0;
bottom: 0;
border-right: 1px solid #f0f3f2;
padding-top: 0;
padding-top: 60px;
transition: margin-top 0.2s linear;

&::-webkit-scrollbar {
Expand Down
2 changes: 1 addition & 1 deletion themes/cypress/source/css/_partial/toc.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
opacity: 0.8;
justify-self: flex-end;
position: fixed;
top: 0;
top: 60px;
right: 0;
bottom: 0;
overflow-y: auto;
Expand Down
4 changes: 2 additions & 2 deletions themes/cypress/source/js/banners_actualization.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@

function actualizeSidebarsMarginTop (margin) {
if (document.querySelector('#sidebar')) {
document.querySelector('#sidebar').style.marginTop = margin.toString() + 'px'
document.querySelector('#sidebar').style.marginTop = (margin - 60).toString() + 'px'
}

if (document.querySelector('#article-toc')) {
document.querySelector('#article-toc').style.marginTop = margin.toString() + 'px'
document.querySelector('#article-toc').style.marginTop = (margin - 60).toString() + 'px'
}
}

Expand Down