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

fix: issue-7715 #23575

Merged
merged 64 commits into from
Sep 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
3085722
replace stack with sourceMapped, remove sourceMappedStack
rachelruderman Aug 26, 2022
3feb6c6
update test name
rachelruderman Aug 26, 2022
435ee48
fix stack trace issue
rachelruderman Aug 27, 2022
ac0f1f7
fix tests
rachelruderman Aug 27, 2022
a27a91f
remove err.stack assertions for cy.origin
rachelruderman Aug 27, 2022
bf5a277
Merge branch 'develop' into issue-7715
rachelruderman Aug 27, 2022
0699db6
remove remaining references to sourceMappedStack
rachelruderman Aug 28, 2022
14883f0
restore orig state of orig tests
rachelruderman Aug 29, 2022
3ccacff
revert changes to reconstruct stack
rachelruderman Aug 29, 2022
1be8488
Update stack_utils.cy.js
rachelruderman Aug 31, 2022
e95aaf9
strip leading whitespace
rachelruderman Aug 31, 2022
3e08f6b
Merge branch 'develop' into issue-7715
rachelruderman Aug 31, 2022
9f2afb7
update tests
rachelruderman Aug 31, 2022
20e1a22
Merge branch 'develop' into issue-7715
rachelruderman Aug 31, 2022
1e15e66
Update cy_origin_error_spec.ts
rachelruderman Aug 31, 2022
e8a5267
Remove console log
rachelruderman Aug 31, 2022
899feff
Trigger Build
rachelruderman Aug 31, 2022
fe4f5ba
Merge branch 'develop' into issue-7715
rachelruderman Aug 31, 2022
cdc2411
Trigger Build
rachelruderman Aug 31, 2022
65d87ea
push notes
rachelruderman Sep 2, 2022
5812672
try stripping stack from message
rachelruderman Sep 2, 2022
6d7e5b4
revert
rachelruderman Sep 2, 2022
d98b892
try using splitStack
rachelruderman Sep 2, 2022
c5303f8
Update webpack_dev_server_fresh_spec.ts
rachelruderman Sep 2, 2022
32e056a
Merge branch 'develop' into issue-7715
rachelruderman Sep 2, 2022
d0cfd5d
source map fixes
rachelruderman Sep 3, 2022
78a4523
fix error lines, add comments
rachelruderman Sep 3, 2022
23417cd
restore stackLineRegex
rachelruderman Sep 3, 2022
c81e165
remove comments
rachelruderman Sep 3, 2022
21aab6b
update column numbers
rachelruderman Sep 3, 2022
64d3fd3
clean up diffs
rachelruderman Sep 3, 2022
dc9f7d6
update tests
rachelruderman Sep 3, 2022
d643967
use es6 array methods, fix snapshot column, remove comments
rachelruderman Sep 3, 2022
fb1ccfe
Merge branch 'develop' into issue-7715
rachelruderman Sep 4, 2022
ac25d53
Restore lodash reduce, remove other lodash
rachelruderman Sep 4, 2022
e12afa8
fix lodash errors
rachelruderman Sep 4, 2022
c1ecce8
fix new lines
rachelruderman Sep 4, 2022
59f12db
use trimEnd instead of trim
rachelruderman Sep 4, 2022
3bec9ff
bring back _trim
rachelruderman Sep 4, 2022
aa7cf8f
fix column line
rachelruderman Sep 4, 2022
e4e2b33
Merge branch 'develop' into issue-7715
rachelruderman Sep 7, 2022
82cd21b
go back to adding 1 to column number
chrisbreiding Sep 7, 2022
138b3fd
revert lodash changes
rachelruderman Sep 8, 2022
ffc67b8
restore trimEnd()
rachelruderman Sep 8, 2022
7399376
Restore OG state of spec_isolation_spec.js snapshot
rachelruderman Sep 8, 2022
bed709c
clean up diffs - bring back new line at EOF
rachelruderman Sep 8, 2022
92c00bd
Merge branch 'develop' into issue-7715
rachelruderman Sep 8, 2022
84baa3b
move where the column is incremented
chrisbreiding Sep 8, 2022
ef4566e
Merge branch 'issue-7715' of github.com:cypress-io/cypress into issue…
chrisbreiding Sep 8, 2022
3d43571
update visit spec snapshot
chrisbreiding Sep 8, 2022
3b85a7a
fix tests
chrisbreiding Sep 8, 2022
2a283a7
remove skipped e2e tests
chrisbreiding Sep 8, 2022
5bcd2ab
remove more skipped stuff
chrisbreiding Sep 8, 2022
48738c5
update snapshot
chrisbreiding Sep 8, 2022
a144f04
update snapshot
chrisbreiding Sep 8, 2022
d408a73
update snapshot
chrisbreiding Sep 8, 2022
8d0daf1
fix typo
chrisbreiding Sep 8, 2022
1a356f1
update reporter errors spec to factor in stack/code frame differences
chrisbreiding Sep 8, 2022
2819b68
fix snapshot
chrisbreiding Sep 8, 2022
05b8c3d
fix snapshot
chrisbreiding Sep 8, 2022
54b001c
Merge branch 'develop' into issue-7715
rachelruderman Sep 8, 2022
53b99c4
fix snapshots
rachelruderman Sep 9, 2022
7ad31e9
Merge branch 'develop' into issue-7715
rachelruderman Sep 9, 2022
c632be7
Trigger Build
rachelruderman Sep 9, 2022
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
18 changes: 8 additions & 10 deletions packages/app/cypress/e2e/runner/reporter.errors.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,27 +34,24 @@ describe('errors ui', {
})

verify('with expect().<foo>', {
line: 3,
column: 25,
message: `expected 'actual' to equal 'expected'`,
verifyOpenInIde: true,
ideLine: 3,
ideColumn: 25,
})

verify('with assert()', {
column: '(5|12)', // (chrome|firefox)
line: 7,
column: [5, 12], // [chrome, firefox]
message: `should be true`,
verifyOpenInIde: true,
ideLine: 7,
ideColumn: 5,
})

verify('with assert.<foo>()', {
line: 11,
column: 12,
message: `expected 'actual' to equal 'expected'`,
verifyOpenInIde: true,
ideLine: 11,
ideColumn: 12,
})
})

Expand Down Expand Up @@ -85,7 +82,8 @@ describe('errors ui', {

verify('in file outside project', {
message: 'An outside error',
regex: /\/throws\-error\.js:5:9/,
stackRegex: /\/throws\-error\.js:5:8/,
codeFrameRegex: /\/throws\-error\.js:5:9/,
codeFrameText: `thrownewError('An outside error')`,
})
})
Expand All @@ -100,7 +98,7 @@ describe('errors ui', {
// https://github.com/cypress-io/cypress/issues/8288
// https://github.com/cypress-io/cypress/issues/8350
verify('test', {
column: '(7|18)', // (chrome|firefox)
column: [7, 18], // [chrome, firefox]
codeFrameText: 'beforeEach(()=>',
message: `Cypress detected you registered a(n) beforeEach hook while a test was running`,
})
Expand Down Expand Up @@ -483,7 +481,7 @@ describe('errors ui', {
})

verify('from chai expect', {
column: '(5|12)', // (chrome|firefox)
column: [5, 12], // [chrome, firefox]
message: 'Invalid Chai property: nope',
stack: ['proxyGetter', 'From Your Spec Code:'],
})
Expand Down
2 changes: 1 addition & 1 deletion packages/app/cypress/e2e/runner/reporter.hooks.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ describe('hooks', {

cy.withCtx((ctx, o) => {
expect(ctx.actions.file.openFile).to.have.been.calledWith(o.sinon.match(new RegExp(`hooks/basic\.cy\.js$`)), o.ideLine, o.ideColumn)
}, { ideLine: 2, ideColumn: Cypress.browser.family === 'firefox' ? 6 : 3 })
}, { ideLine: 2, ideColumn: Cypress.browser.family === 'firefox' ? 5 : 2 })
})

it('does not display commands from skipped tests', () => {
Expand Down
Loading