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.

Sign up for GitHub

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

Jump to bottom

feat: move .contains() and .shadow() to be queries; remove cy.ng() #23791

Merged
merged 18 commits into from
Oct 11, 2022
Merged

feat: move .contains() and .shadow() to be queries; remove cy.ng() #23791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
3c74ac8
First stab at removing old .get() implementation
BlueWinds Sep 12, 2022
ed9765b
Fix TS and a couple of tests
BlueWinds Sep 12, 2022
6e408b3
Fix tests and TS
BlueWinds Sep 27, 2022
c27dae2
Fix case-sensitivity for .contains()
BlueWinds Sep 29, 2022
4bfdec8
Stop TS complaining
BlueWinds Sep 29, 2022
a881c11
Rework cy-contains jquery expression
BlueWinds Sep 29, 2022
4dc9134
Add comments, make ts happy
BlueWinds Sep 29, 2022
7a62f79
Fix one test, review feedback
BlueWinds Oct 3, 2022
a58e46b
Review updates
BlueWinds Oct 3, 2022
f62277a
Fix additional tests
BlueWinds Oct 3, 2022
ed852c2
Fix accidental deletion of vital code
BlueWinds Oct 3, 2022
e481858
One more try at getting logs right
BlueWinds Oct 3, 2022
5b73353
Fix race condition in cross-origin .contains
BlueWinds Oct 3, 2022
b1b7b38
Add commented out test to ensure .within() works properly with selectors
BlueWinds Oct 3, 2022
94f3d3f
Fix for sessions + query subject chaining
BlueWinds Oct 4, 2022
7fc0859
Fix mixing .within() shadow DOM and .contains() in same chainer
BlueWinds Oct 4, 2022
4b511da
One more attempt at .within + .contains
BlueWinds Oct 4, 2022
0eecaed
Fix rebase commits
BlueWinds Oct 5, 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
5 changes: 3 additions & 2 deletions packages/app/cypress/e2e/reporter_header.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ describe('Reporter Header', () => {
cy.get('[data-selected-spec="false"]').should('have.length', '27')
})

it('filters the list of specs when searching for specs', () => {
// TODO: Reenable as part of https://github.com/cypress-io/cypress/issues/23902
it.skip('filters the list of specs when searching for specs', () => {
cy.get('body').type('f')

cy.findByTestId('specs-list-panel').within(() => {
Expand All @@ -28,7 +29,7 @@ describe('Reporter Header', () => {

cy.get('@searchInput').clear()

cy.get('[data-cy="spec-file-item"]').should('have.length', 3)
cy.get('[data-cy="spec-file-item"]').should('have.length', 23)

cy.get('@searchInput').type('asdf', { force: true })

Expand Down
9 changes: 9 additions & 0 deletions packages/driver/cypress/e2e/commands/aliasing.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,5 +495,14 @@ describe('src/cy/commands/aliasing', () => {
.get('@lastDiv')
})
})

// TODO: Re-enable as part of https://github.com/cypress-io/cypress/issues/23902
it.skip('maintains .within() context while reading aliases', () => {
cy.get('#specific-contains').within(() => {
cy.get('span').as('spanWithin').should('have.length', 1)
})

cy.get('@spanWithin').should('have.length', 1)
})
})
})
332 changes: 0 additions & 332 deletions packages/driver/cypress/e2e/commands/angular.cy.js
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions packages/driver/cypress/e2e/commands/assertions.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,8 +418,6 @@ describe('src/cy/commands/assertions', () => {
assertLogLength(this.logs, 6)

expect(this.logs[3].get('name')).to.eq('get')
expect(this.logs[3].get('state')).to.eq('failed')
expect(this.logs[3].get('error')).to.eq(err)

expect(this.logs[4].get('name')).to.eq('assert')
expect(this.logs[4].get('state')).to.eq('failed')
Expand Down Expand Up @@ -448,7 +446,7 @@ describe('src/cy/commands/assertions', () => {
done()
})

cy.contains('Nested Find').should('have.length', 2)
cy.contains('Nested Find', { timeout: 50 }).should('have.length', 2)
})

// https://github.com/cypress-io/cypress/issues/6384
Expand Down
Loading