Skip to content

Commit afb0b98

Browse files
authored
Merge branch 'main' into gha/browser-testing
2 parents 3238530 + a108993 commit afb0b98

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+273
-226
lines changed

docs/api/cypress-api/custom-commands.mdx

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,15 @@ Cypress comes with its own API for creating custom commands and overwriting
77
existing commands. The built in Cypress commands use the very same API that's
88
defined below.
99

10+
There are two API available for adding custom commands:
11+
12+
- [`Cypress.Commands.add()`](#Syntax) - use to add a custom command to use when
13+
writing tests
14+
- [`Cypress.Command.overwrite()`](#Overwrite-Existing-Commands) - use to
15+
override an existing built-in Cypress command or reserved internal function.
16+
**Caution:** this overrides it for Cypress as well and could impact how
17+
Cypress behaves.
18+
1019
:::info
1120

1221
If you want your method to have builtin

docs/guides/cloud/organizations.mdx

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -336,11 +336,14 @@ addition to the documentation below, refer to the Microsoft Guides for
336336
🎉 Your integration is now complete! You can invite all of the users in your
337337
organization to sign in through your SSO provider.
338338

339-
#### **Notes**
339+
#### Notes
340340

341-
- Once SSO is set up in Cypress Cloud, Users should be invited via your SSO
342-
provider, not Cypress Cloud.
341+
- Once SSO is successfully set up, users will need to be invited via your SSO
342+
provider, as the Cypress Cloud invitation option will be disabled.
343343
- All SSO Users are initially added with the
344-
[User Role](https://on.cypress.io/users#User-roles) of Member. If a User needs
344+
[User Role](/guides/cloud/users#User-roles) of Member. If a User needs
345345
different User Role permissions, this can be changed via Cypress Cloud by a
346346
current member with the role of Owner or Admin.
347+
- SSO users are separate accounts from Google/GitHub or email/password users. If
348+
there are duplicate users, duplicates can be removed by any
349+
[Owner or Admin](/guides/cloud/users#User-roles).

0 commit comments

Comments
 (0)