Skip to content
New issue

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

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

Already on GitHub? # to your account

Screenshot fixes/enhancements #1858

Merged
merged 41 commits into from
Jun 18, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
df03fb2
create directory path from screenshot name
chrisbreiding May 30, 2018
9945e87
fix screenshot e2e specs
chrisbreiding May 30, 2018
0c582f7
ensure unique file paths for non-named screenshots
chrisbreiding May 31, 2018
ad0547c
Merge branch 'develop' into issue-1766-1771-1826-screenshot-enhancements
chrisbreiding May 31, 2018
b047fcf
append failure screenshots with ‘— failure’
chrisbreiding May 31, 2018
7871ca8
fix snapshot differences caused by slow computer
chrisbreiding May 31, 2018
2b0d33e
fix driver specs
chrisbreiding May 31, 2018
fb3e1dc
fix minutes/seconds e2e snapshot replacer
chrisbreiding May 31, 2018
3c887eb
fix minutes/seconds e2e snapshot replacer again
chrisbreiding May 31, 2018
b9a75f9
fix e2e specs failing due to screenshot path differences
chrisbreiding May 31, 2018
6f8af35
more snapshot fixes
chrisbreiding May 31, 2018
6914862
more snapshot fixes
chrisbreiding Jun 1, 2018
8e446b6
more snapshot fixes
chrisbreiding Jun 1, 2018
24494f6
fix reporter showing wrong path for nested spec when no tests
chrisbreiding Jun 1, 2018
ada49ef
nest non-named screenshots in path based on spec path
chrisbreiding Jun 1, 2018
713ae40
fix specs
chrisbreiding Jun 1, 2018
82ea8ea
fix snapshot
chrisbreiding Jun 1, 2018
9065b13
Merge branch 'develop' into issue-1766-1771-1826-screenshot-enhancements
chrisbreiding Jun 1, 2018
5b52f5a
test that server + project state is reset between specs in cypress ru…
brian-mann Jun 9, 2018
6962395
rename spec.path to spec.relative. pass around the spec object instea…
brian-mann Jun 10, 2018
5ba2014
remove pretty-error dependency
brian-mann Jun 10, 2018
b68c549
fixes #1919 and #1918, add Cypress.spec and Cypress.browser
brian-mann Jun 10, 2018
1be143f
Merge branch 'develop' into issue-1766-1771-1826-screenshot-enhancements
brian-mann Jun 10, 2018
35cde83
fixes all the failing tests
brian-mann Jun 10, 2018
1070b20
Merge remote-tracking branch 'origin/issue-1766-1771-1826-screenshot-…
brian-mann Jun 10, 2018
81f7fdc
fixes failing tests
brian-mann Jun 10, 2018
39a7517
types: Cypress.spec
bahmutov Jun 10, 2018
5798ea2
add types for Cypress.browser
bahmutov Jun 10, 2018
7393966
fixes more failing tests
brian-mann Jun 11, 2018
ec758d5
Merge remote-tracking branch 'origin/issue-1766-1771-1826-screenshot-…
brian-mann Jun 11, 2018
4ea9314
enable null for spec props when running "All Specs"
brian-mann Jun 11, 2018
73fa305
read comments per PR
brian-mann Jun 11, 2018
32cbc68
fixes failing tests
brian-mann Jun 11, 2018
73e2c07
fix linting
brian-mann Jun 11, 2018
9066d48
fix types assertion
brian-mann Jun 11, 2018
b5175d9
fixes failing tests
brian-mann Jun 11, 2018
4c45c6f
fixes failing tests, update from -- failed to (failed)
brian-mann Jun 11, 2018
a52d088
ugh regexp
brian-mann Jun 11, 2018
bd34aa3
fixes more tests
brian-mann Jun 11, 2018
7a60f1b
add name, specName, and testFailure to the afterScreenshot props
brian-mann Jun 17, 2018
2377ed8
fix failing tests. append (failed) for failed screenshots
brian-mann Jun 17, 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
26 changes: 26 additions & 0 deletions cli/types/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,18 @@ declare namespace Cypress {
username: string
password: string
}

/**
* Describes a browser Cypress can control
*/
interface Browser {
name: "electron" | "chrome" | "canary" | "chromium" | "firefox"
displayName: "Electron" | "Chrome" | "Canary" | "Chromium" | "FireFox"
version: string
majorVersion: string
path: string
}

/**
* Several libraries are bundled with Cypress by default.
*
Expand Down Expand Up @@ -125,6 +137,20 @@ declare namespace Cypress {
*/
arch: string

/**
* Currently executing spec file.
*/
spec: {
name: string // "config_passing_spec.coffee"
relative: string | null // "cypress/integration/config_passing_spec.coffee"
absolute: string | null
}

/**
* Information about the browser currently running the tests
*/
browser: Browser

/**
* @see https://on.cypress.io/config
*/
Expand Down
Loading