Skip to content
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
597d133
Merge branch 'develop' into issue-461
jennifer-shehane Mar 14, 2018
066a0fd
update Dashboard service screenshots / content
jennifer-shehane Mar 14, 2018
ce9d3fe
Update description and examples for '--spec' arg in command log
jennifer-shehane Mar 14, 2018
0187a48
Merge branch 'develop' into issue-461
jennifer-shehane Apr 23, 2018
e5d5d75
Began writing changelog for 3.0.0
jennifer-shehane Apr 23, 2018
9c33e0d
Merge branch 'develop' into issue-461
jennifer-shehane May 11, 2018
355b483
update roadmap to remove 'running multiple specs'
jennifer-shehane May 11, 2018
ae9f4b8
Update docs to reflect new example seeded files
jennifer-shehane May 11, 2018
0954377
Add more merged PRs to the changelog
jennifer-shehane May 11, 2018
b5081ce
added more 3.0 fixes to changelog
jennifer-shehane May 14, 2018
0be8f90
add newest commits to changelog
jennifer-shehane May 14, 2018
0f7fb16
Add more merged PRs to changelog
jennifer-shehane May 15, 2018
6153877
package.lock update
jennifer-shehane May 15, 2018
8baf161
Added a couple merged prs to changelog
jennifer-shehane May 16, 2018
c644fdd
Merge branch 'develop' into issue-461
jennifer-shehane May 16, 2018
6ccc5d5
update package.lock
jennifer-shehane May 16, 2018
894c490
Add doc for cy.task() (#445)
chrisbreiding May 16, 2018
833296d
remove 'comments: false' from each files - it does nothing.
jennifer-shehane May 16, 2018
ccc299a
Added Cypress binary feature to changelog - removed from roadmap
jennifer-shehane May 16, 2018
8d6add7
Begin editing cy.task() doc
jennifer-shehane May 16, 2018
abd093b
Normalize use of Node across docs to be capitalized and not in code b…
jennifer-shehane May 16, 2018
4b2dee6
Edit cy.task
jennifer-shehane May 16, 2018
3480e01
Update viewport arguments with changes to width and height bounds (#456)
dallaspersson May 16, 2018
42af076
add screenshot content to changelog
jennifer-shehane May 16, 2018
3e0cdb3
Add screenshot configuration doc (#480)
chrisbreiding May 16, 2018
e8354af
Merge remote-tracking branch 'origin/issue-461' into issue-461
jennifer-shehane May 16, 2018
7c2b1b8
Clean up screenshot doc for release
jennifer-shehane May 16, 2018
90fc735
Edit screenshot api file
jennifer-shehane May 16, 2018
5842377
Merge branch 'develop' into issue-461
jennifer-shehane May 17, 2018
548b243
Update screenshot doc to be more specific after clarification.
jennifer-shehane May 17, 2018
e0e59d2
Added an example of seeding a db to cy.task
jennifer-shehane May 17, 2018
64ea501
added newest chrome flag to changelog
jennifer-shehane May 17, 2018
5afd2f7
package-lock changes
chrisbreiding May 18, 2018
0ac3cc6
fix time out grammar
chrisbreiding May 18, 2018
d68ca8c
update screenshot docs to latest api
chrisbreiding May 18, 2018
e2b0de0
fullpage -> fullPage
chrisbreiding May 18, 2018
692f81d
Merge branch 'develop' into issue-461
jennifer-shehane May 18, 2018
cb3435c
Merge branch 'develop' into issue-461
jennifer-shehane May 21, 2018
2637e8f
CLI Caching (#596)
kuceb May 21, 2018
8ef0194
woops - forgot to save package-lock
jennifer-shehane May 21, 2018
45f3ea4
Added newly fixed issues to changelog
jennifer-shehane May 21, 2018
9d55213
Clean up some of new docs
jennifer-shehane May 21, 2018
0c9ba5a
package-lock
jennifer-shehane May 21, 2018
60b8e76
Add 2 new issues to changelog
jennifer-shehane May 22, 2018
2216fa7
Merge branch 'develop' into issue-461
jennifer-shehane May 22, 2018
ce2b56d
Merge branch 'develop' into issue-461
jennifer-shehane May 24, 2018
3e69df1
Update uses of 'headless' to ‘during cypress run’
jennifer-shehane May 24, 2018
62989ee
Update answer in FAQ on 'how to run group of specs' to match new spec…
jennifer-shehane May 24, 2018
cc377c7
Update launching browsers to say we now disable device discovery noti…
jennifer-shehane May 24, 2018
d7f3f8c
Rename config trashAssetsBeforeHeadlessRuns to trashAssetsBeforeRuns
jennifer-shehane May 24, 2018
6e9691c
Fixes to inaccurate docs
jennifer-shehane May 24, 2018
759ccc5
Update dashboard content/screenshots
jennifer-shehane May 24, 2018
13ec2ea
update changelog to specify that video filenames are only changed loc…
jennifer-shehane May 24, 2018
975ff0e
SelectorPlayground -> Screenshot in screenshot api doc
chrisbreiding May 29, 2018
ab5345c
document screenshot callbacks
chrisbreiding May 29, 2018
407004a
add missing 'is'
jennifer-shehane May 29, 2018
589e390
Add missing 'is'
jennifer-shehane May 29, 2018
5d09e22
clean up some headers/content for screenshots
jennifer-shehane May 29, 2018
f1f4d76
Merge branch 'develop' into issue-461
jennifer-shehane May 29, 2018
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ node_modules/
db.json
public/
*.log
.history
.DS_Store
.history
.deploy*/
Expand Down
6 changes: 6 additions & 0 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ jobs:
key: cypress-documentation-{{ .Branch }}-{{ .Revision }}
paths:
- /root/cypress-documentation
- store_artifacts:
path: ~/.npm/_logs

"docs-tests":
<<: *defaults
Expand Down Expand Up @@ -99,6 +101,8 @@ jobs:
path: cypress/videos
- store_artifacts:
path: cypress/screenshots
- store_artifacts:
path: npm-debug.log

"deploy-docs-staging":
<<: *defaults
Expand Down Expand Up @@ -126,6 +130,8 @@ jobs:
path: cypress/videos
- store_artifacts:
path: cypress/screenshots
- store_artifacts:
path: npm-debug.log

"deploy-docs-production":
<<: *defaults
Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/main_spec.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ API_PATH = "/api/introduction/api"
EXAMPLES_PATH = "/examples/examples/recipes"
FAQ_PATH = "/faq/questions/using-cypress-faq"

describe "Documentation", ->
describe "Main", ->
beforeEach ->
cy.server()

Expand Down
17 changes: 17 additions & 0 deletions lib/tags/requirements.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,12 @@ module.exports = function yields (hexo, args) {
</ul>`
}

const dualExistenceSingleDom = () => {
return `<ul>
<li><p>${cmd} can be chained off of <code>cy</code> or off a command that yields a single DOM element.</p></li>
</ul>`
}

const spread = () => {
return `<ul>
<li><p>${childCmd}.</p></li>
Expand All @@ -120,6 +126,13 @@ module.exports = function yields (hexo, args) {
</ul>`
}

const task = () => {
return `<ul>
<li><p>${parentCmd}.</p></li>
<li><p>${cmd} requires the task to eventually end.</p></li>
</ul>`
}

const writeFile = () => {
return `<ul>
<li><p>${parentCmd}.</p></li>
Expand Down Expand Up @@ -172,6 +185,8 @@ module.exports = function yields (hexo, args) {
return dual()
case 'dual_existence':
return dualExistence()
case 'dual_existence_single_dom':
return dualExistenceSingleDom()
case 'clearability':
return clearability()
case 'blurability':
Expand All @@ -190,6 +205,8 @@ module.exports = function yields (hexo, args) {
return spread()
case 'exec':
return exec()
case 'task':
return task()
case 'read_file':
return readFile()
case 'write_file':
Expand Down
10 changes: 9 additions & 1 deletion lib/tags/timeouts.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ module.exports = function yields (hexo, args) {
<li><p>${cmd} should never time out.</p></li>
</ul>
{% note warning %}
Because ${cmd} is asynchronous it is technically possible for there to be a time out while talking to the internal Cypress automation API's. But for practical purposes it should never happen.
Because ${cmd} is asynchronous it is technically possible for there to be a timeout while talking to the internal Cypress automation API's. But for practical purposes it should never happen.
{% endnote %}`)
}

Expand All @@ -64,6 +64,12 @@ module.exports = function yields (hexo, args) {
</ul>`
}

const task = () => {
return `<ul>
<li><p>${cmd} can time out waiting for the task to end.</p></li>
</ul>`
}

const none = () => {
return `<ul>
<li><p>${cmd} can not time out.</p></li>
Expand Down Expand Up @@ -115,6 +121,8 @@ module.exports = function yields (hexo, args) {
return its()
case 'exec':
return exec()
case 'task':
return task()
case 'none':
return none()
case 'page':
Expand Down
25 changes: 12 additions & 13 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions source/_data/sidebar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ api:
spy: spy.html
stub: stub.html
submit: submit.html
task: task.html
then: then.html
tick: tick.html
title: title.html
Expand All @@ -147,6 +148,7 @@ api:
cypress-api:
custom-commands: custom-commands.html
cookies: cookies.html
screenshot-api: screenshot-api.html
selector-playground-api: selector-playground-api.html
cypress-server: cypress-server.html
arch: arch.html
Expand Down
2 changes: 1 addition & 1 deletion source/api/commands/_scrollintoview.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: scrollIntoView
comments: false

---

Scroll an element into view.
Expand Down
2 changes: 1 addition & 1 deletion source/api/commands/_scrollto.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: scrollTo
comments: false

---

Scroll to a specific position.
Expand Down
2 changes: 1 addition & 1 deletion source/api/commands/_trigger.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: trigger
comments: false

---

Trigger an event on a DOM element.
Expand Down
2 changes: 1 addition & 1 deletion source/api/commands/and.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: and
comments: false

---

Create an assertion. Assertions are automatically retried until they pass or time out.
Expand Down
2 changes: 1 addition & 1 deletion source/api/commands/as.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: as
comments: false

---

Assign an alias for later use. Reference the alias later within a {% url `cy.get()` get %} or {% url `cy.wait()` wait %} command with a `@` prefix.
Expand Down
2 changes: 1 addition & 1 deletion source/api/commands/blur.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: blur
comments: false

---

Blur a focused element.
Expand Down
2 changes: 1 addition & 1 deletion source/api/commands/check.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: check
comments: false

---

Check checkbox(es) or radio(s).
Expand Down
2 changes: 1 addition & 1 deletion source/api/commands/children.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: children
comments: false

---

Get the children of each DOM element within a set of DOM elements.
Expand Down
2 changes: 1 addition & 1 deletion source/api/commands/clear.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: clear
comments: false

---

Clear the value of an `input` or `textarea`.
Expand Down
2 changes: 1 addition & 1 deletion source/api/commands/clearcookie.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: clearCookie
comments: false

---

Clear a specific browser cookie.
Expand Down
2 changes: 1 addition & 1 deletion source/api/commands/clearcookies.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: clearCookies
comments: false

---

Clear all browser cookies.
Expand Down
2 changes: 1 addition & 1 deletion source/api/commands/clearlocalstorage.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: clearLocalStorage
comments: false

---

Clear data in local storage.
Expand Down
2 changes: 1 addition & 1 deletion source/api/commands/click.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: click
comments: false

---

Click a DOM element.
Expand Down
2 changes: 1 addition & 1 deletion source/api/commands/clock.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: clock
comments: false

---

`cy.clock()` overrides native global functions related to time allowing them to be controlled synchronously via {% url `cy.tick()` tick %} or the yielded `clock` object. This includes controlling:
Expand Down
2 changes: 1 addition & 1 deletion source/api/commands/closest.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: closest
comments: false

---

Get the first DOM element that matches the selector (whether it be itself or one of its ancestors).
Expand Down
2 changes: 1 addition & 1 deletion source/api/commands/contains.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: contains
comments: false

---

Get the DOM element containing the text. DOM elements can contain *more* than the desired text and still match. Additionally, Cypress {% urlHash 'prefers some DOM elements' Notes %} over the deepest element found.
Expand Down
2 changes: 1 addition & 1 deletion source/api/commands/dblclick.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: dblclick
comments: false

---

Double-click a DOM element.
Expand Down
4 changes: 2 additions & 2 deletions source/api/commands/debug.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: debug
comments: false

---

Set a `debugger` and log what the previous command yields.
Expand Down Expand Up @@ -89,4 +89,4 @@ When clicking on the `debug` command within the command log, the console outputs
- {% url 'Dashboard' https://on.cypress.io/dashboard %}
- {% url `.pause()` pause %}
- {% url `cy.log()` log %}
- {% url `cy.screenshot()` screenshot %}
- {% url `.screenshot()` screenshot %}
2 changes: 1 addition & 1 deletion source/api/commands/document.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: document
comments: false

---

Get the `window.document` of the page that is currently active.
Expand Down
2 changes: 1 addition & 1 deletion source/api/commands/each.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: each
comments: false

---

Iterate through an array like structure (arrays or objects with a `length` property).
Expand Down
2 changes: 1 addition & 1 deletion source/api/commands/end.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: end
comments: false

---

End a chain of commands.
Expand Down
2 changes: 1 addition & 1 deletion source/api/commands/eq.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: eq
comments: false

---

Get A DOM element at a specific index in an array of elements.
Expand Down
2 changes: 1 addition & 1 deletion source/api/commands/exec.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: exec
comments: false

---

Execute a system command.
Expand Down
2 changes: 1 addition & 1 deletion source/api/commands/filter.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: filter
comments: false

---

Get the DOM elements that match a specific selector.
Expand Down
Loading