-
Notifications
You must be signed in to change notification settings - Fork 3.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '10.0-release' into tgriesser/refactor/error-improvements
* 10.0-release: fix: restore @lmiller1990's changes feat: styling snapshots (#19972) fix bad merge overrides- GOOD CATCH TYLER! fix(unify): Updating reporter to consistently use app-provided "Preferred Editor" dialog (#19933) fix: move node 17 Check from Binary to CLI (#19977) fix: pass correct spec URL in `cypress run` on Windows (#19890) fix: send click event with `cy.type('{enter}')`. (#19726) feat: detect package manager in wizard (#19960) fix: refactor set specs by specPattern (#19953) chore: Update Chrome (beta) to 98.0.4758.74
- Loading branch information
Showing
62 changed files
with
1,042 additions
and
558 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,6 +14,7 @@ | |
"NOTESTS", | ||
"OVERLIMIT", | ||
"Pinia", | ||
"pnpm", | ||
"Screenshotting", | ||
"shiki", | ||
"testid", | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
{ | ||
"chrome:beta": "98.0.4758.66", | ||
"chrome:beta": "98.0.4758.74", | ||
"chrome:stable": "97.0.4692.99" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -31,7 +31,6 @@ chrome-profiler-events*.json | |
.history/* | ||
|
||
# misc | ||
/.angular/cache | ||
/.sass-cache | ||
/connect.lock | ||
/coverage | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -36,4 +36,4 @@ | |
"karma-jasmine-html-reporter": "^1.5.0", | ||
"typescript": "~4.5.5" | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,90 @@ | ||
import { verify } from './support/verify-helpers' | ||
|
||
describe('errors ui', { | ||
viewportHeight: 768, | ||
viewportWidth: 1024, | ||
}, () => { | ||
describe('assertion failures', () => { | ||
beforeEach(() => { | ||
cy.scaffoldProject('runner-e2e-specs') | ||
cy.openProject('runner-e2e-specs') | ||
|
||
// set preferred editor to bypass IDE selection dialog | ||
cy.withCtx((ctx) => { | ||
ctx.coreData.localSettings.availableEditors = [ | ||
...ctx.coreData.localSettings.availableEditors, | ||
{ | ||
id: 'test-editor', | ||
binary: '/usr/bin/test-editor', | ||
name: 'Test editor', | ||
}, | ||
] | ||
|
||
ctx.coreData.localSettings.preferences.preferredEditorBinary = 'test-editor' | ||
}) | ||
|
||
cy.startAppServer() | ||
cy.visitApp() | ||
|
||
cy.contains('[data-cy=spec-item]', 'assertions.cy.js').click() | ||
|
||
cy.location().should((location) => { | ||
expect(location.hash).to.contain('assertions.cy.js') | ||
}) | ||
|
||
// Wait for specs to complete | ||
cy.findByLabelText('Stats').get('.failed', { timeout: 10000 }).should('have.text', 'Failed:3') | ||
}) | ||
|
||
verify.it('with expect().<foo>', { | ||
file: 'assertions.cy.js', | ||
hasPreferredIde: true, | ||
column: 25, | ||
message: `expected 'actual' to equal 'expected'`, | ||
codeFrameText: 'with expect().<foo>', | ||
}) | ||
|
||
verify.it('with assert()', { | ||
file: 'assertions.cy.js', | ||
hasPreferredIde: true, | ||
column: '(5|12)', // (chrome|firefox) | ||
message: `should be true`, | ||
codeFrameText: 'with assert()', | ||
}) | ||
|
||
verify.it('with assert.<foo>()', { | ||
file: 'assertions.cy.js', | ||
hasPreferredIde: true, | ||
column: 12, | ||
message: `expected 'actual' to equal 'expected'`, | ||
codeFrameText: 'with assert.<foo>()', | ||
}) | ||
}) | ||
|
||
describe('assertion failures - no preferred IDE', () => { | ||
beforeEach(() => { | ||
cy.scaffoldProject('runner-e2e-specs') | ||
cy.openProject('runner-e2e-specs') | ||
|
||
cy.startAppServer() | ||
cy.visitApp() | ||
|
||
cy.contains('[data-cy=spec-item]', 'assertions.cy.js').click() | ||
|
||
cy.location().should((location) => { | ||
expect(location.hash).to.contain('assertions.cy.js') | ||
}) | ||
|
||
// Wait for specs to complete | ||
cy.findByLabelText('Stats').get('.failed', { timeout: 10000 }).should('have.text', 'Failed:3') | ||
}) | ||
|
||
verify.it('with expect().<foo>', { | ||
file: 'assertions.cy.js', | ||
hasPreferredIde: false, | ||
column: 25, | ||
message: `expected 'actual' to equal 'expected'`, | ||
codeFrameText: 'with expect().<foo>', | ||
}) | ||
}) | ||
}) |
Oops, something went wrong.