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(labware-creator): autofill homogenousWells for tipRacks #7806

Merged
merged 5 commits into from
May 19, 2021
Merged

feat(labware-creator): autofill homogenousWells for tipRacks #7806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
50038a1
feat(labware-creator): autofill homogenousWells for tipRacks
IanLondon May 12, 2021
dd32537
fix autofills
IanLondon May 12, 2021
3ca71e8
add tests to CreateNewDefinition and fix accessibility on Dropdown
IanLondon May 14, 2021
5873ea7
fix e2e tests with Dropdown changes
IanLondon May 14, 2021
aeaf51f
fix prettier errors
IanLondon May 17, 2021
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
11 changes: 9 additions & 2 deletions labware-library/cypress/integration/labware-creator/fileImport.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,15 @@ context('File Import', () => {
cy.get("input[placeholder='testpro_15_wellplate_5ul']").should('exist')

// Test pipette
cy.contains('Select...').click({ force: true })
cy.contains('P10 Single GEN1').click({ force: true })
// TODO(IL, 2021-05-15): give Dropdown component semantic selectors for E2E
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oof ya we should def throw in selectors

cy.get('label')
.contains('Test Pipette')
.children()
.first()
.trigger('mousedown')
cy.get('*[class^="Dropdown__option_label"]')
.contains('P10 Single GEN1')
.click()

// All fields present
cy.get('button[class*="_export_button_"]').click({ force: true })
Expand Down
18 changes: 15 additions & 3 deletions labware-library/cypress/integration/labware-creator/reservoir.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,12 @@ context('Reservoirs', () => {

describe('Create a reservoir', () => {
before(() => {
cy.contains('Select...').click({ force: true })
// TODO(IL, 2021-05-15): give Dropdown component semantic selectors for E2E
cy.contains('What type of labware are you creating?')
.children()
.first()
.trigger('mousedown')
cy.get('*[class^="Dropdown__option_label"]').contains('Reservoir').click()
cy.contains('Reservoir').click({ force: true })
cy.contains('start creating labware').click({ force: true })
})
Expand Down Expand Up @@ -232,8 +237,15 @@ context('Reservoirs', () => {

// Test pipette
cy.contains('Test Pipette is required').should('exist')
cy.contains('Select...').click({ force: true })
cy.contains('P10 Single').click({ force: true })
// TODO(IL, 2021-05-15): give Dropdown component semantic selectors for E2E
cy.get('label')
.contains('Test Pipette')
.children()
.first()
.trigger('mousedown')
cy.get('*[class^="Dropdown__option_label"]')
.contains('P10 Single GEN1')
.click()
cy.contains('Test Pipette is required').should('not.exist')

// All fields present
Expand Down
184 changes: 146 additions & 38 deletions labware-library/cypress/integration/labware-creator/tubesBlock.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,35 @@ context('Tubes and Block', () => {
cy.visit('/create')
cy.viewport('macbook-15')
cy.contains('NO').click({ force: true })
cy.contains('Select...').click({ force: true })
cy.contains('Tubes / Plates + Opentrons Aluminum Block').click({
force: true,
})
cy.contains('Select...').click({ force: true })
cy.contains('96 well').click({ force: true })
cy.contains('Select...').click({ force: true })
cy.contains(/^Tubes$/).click({ force: true })

// TODO(IL, 2021-05-15): give Dropdown component semantic selectors for E2E
cy.get('label')
.contains('What type of labware are you creating?')
.children()
.first()
.trigger('mousedown')
cy.get('*[class^="Dropdown__option_label"]')
.contains('Tubes / Plates + Opentrons Aluminum Block')
.click()

// TODO(IL, 2021-05-15): give Dropdown component semantic selectors for E2E
cy.get('label')
.contains('Which aluminum block?')
.children()
.first()
.trigger('mousedown')
cy.get('*[class^="Dropdown__option_label"]').contains('96 well').click()

// TODO(IL, 2021-05-15): give Dropdown component semantic selectors for E2E
cy.get('label')
.contains('What labware is on top of your aluminum block?')
.children()
.first()
.trigger('mousedown')
cy.get('*[class^="Dropdown__option_label"]')
.contains(/^Tubes$/)
.click()

cy.contains('start creating labware').click({ force: true })
})

Expand Down Expand Up @@ -152,8 +173,15 @@ context('Tubes and Block', () => {

// Test pipette
cy.contains('Test Pipette is required').should('exist')
cy.contains('Select...').click({ force: true })
cy.contains('P10 Single').click({ force: true })
// TODO(IL, 2021-05-15): give Dropdown component semantic selectors for E2E
cy.get('label')
.contains('Test Pipette')
.children()
.first()
.trigger('mousedown')
cy.get('*[class^="Dropdown__option_label"]')
.contains('P10 Single GEN1')
.click()
cy.contains('Test Pipette is required').should('not.exist')

// All fields present
Expand All @@ -170,14 +198,35 @@ context('Tubes and Block', () => {
cy.visit('/create')
cy.viewport('macbook-15')
cy.contains('NO').click({ force: true })
cy.contains('Select...').click({ force: true })
cy.contains('Tubes / Plates + Opentrons Aluminum Block').click({
force: true,
})
cy.contains('Select...').click({ force: true })
cy.contains('96 well').click({ force: true })
cy.contains('Select...').click({ force: true })
cy.contains('PCR Tube Strip').click({ force: true })

// TODO(IL, 2021-05-15): give Dropdown component semantic selectors for E2E
cy.get('label')
.contains('What type of labware are you creating?')
.children()
.first()
.trigger('mousedown')
cy.get('*[class^="Dropdown__option_label"]')
.contains('Tubes / Plates + Opentrons Aluminum Block')
.click()

// TODO(IL, 2021-05-15): give Dropdown component semantic selectors for E2E
cy.get('label')
.contains('Which aluminum block?')
.children()
.first()
.trigger('mousedown')
cy.get('*[class^="Dropdown__option_label"]').contains('96 well').click()

// TODO(IL, 2021-05-15): give Dropdown component semantic selectors for E2E
cy.get('label')
.contains('What labware is on top of your aluminum block?')
.children()
.first()
.trigger('mousedown')
cy.get('*[class^="Dropdown__option_label"]')
.contains('PCR Tube Strip')
.click()

cy.contains('start creating labware').click({ force: true })
})

Expand Down Expand Up @@ -313,8 +362,15 @@ context('Tubes and Block', () => {

// Test pipette
cy.contains('Test Pipette is required').should('exist')
cy.contains('Select...').click({ force: true })
cy.contains('P10 Single').click({ force: true })
// TODO(IL, 2021-05-15): give Dropdown component semantic selectors for E2E
cy.get('label')
.contains('Test Pipette')
.children()
.first()
.trigger('mousedown')
cy.get('*[class^="Dropdown__option_label"]')
.contains('P10 Single GEN1')
.click()
cy.contains('Test Pipette is required').should('not.exist')

// All fields present
Expand All @@ -331,14 +387,35 @@ context('Tubes and Block', () => {
cy.visit('/create')
cy.viewport('macbook-15')
cy.contains('NO').click({ force: true })
cy.contains('Select...').click({ force: true })
cy.contains('Tubes / Plates + Opentrons Aluminum Block').click({
force: true,
})
cy.contains('Select...').click({ force: true })
cy.contains('96 well').click({ force: true })
cy.contains('Select...').click({ force: true })
cy.contains('PCR Plate').click({ force: true })

// TODO(IL, 2021-05-15): give Dropdown component semantic selectors for E2E
cy.get('label')
.contains('What type of labware are you creating?')
.children()
.first()
.trigger('mousedown')
cy.get('*[class^="Dropdown__option_label"]')
.contains('Tubes / Plates + Opentrons Aluminum Block')
.click()

// TODO(IL, 2021-05-15): give Dropdown component semantic selectors for E2E
cy.get('label')
.contains('Which aluminum block?')
.children()
.first()
.trigger('mousedown')
cy.get('*[class^="Dropdown__option_label"]').contains('96 well').click()

// TODO(IL, 2021-05-15): give Dropdown component semantic selectors for E2E
cy.get('label')
.contains('What labware is on top of your aluminum block?')
.children()
.first()
.trigger('mousedown')
cy.get('*[class^="Dropdown__option_label"]')
.contains('PCR Plate')
.click()

cy.contains('start creating labware').click({ force: true })
})

Expand Down Expand Up @@ -474,8 +551,15 @@ context('Tubes and Block', () => {

// Test pipette
cy.contains('Test Pipette is required').should('exist')
cy.contains('Select...').click({ force: true })
cy.contains('P10 Single').click({ force: true })
// TODO(IL, 2021-05-15): give Dropdown component semantic selectors for E2E
cy.get('label')
.contains('Test Pipette')
.children()
.first()
.trigger('mousedown')
cy.get('*[class^="Dropdown__option_label"]')
.contains('P10 Single GEN1')
.click()
cy.contains('Test Pipette is required').should('not.exist')

// All fields present
Expand All @@ -494,12 +578,29 @@ context('Tubes and Block', () => {
cy.visit('/create')
cy.viewport('macbook-15')
cy.contains('NO').click({ force: true })
cy.contains('Select...').click({ force: true })
cy.contains('Tubes / Plates + Opentrons Aluminum Block').click({
force: true,
})
cy.contains('Select...').click({ force: true })
cy.contains('24 well').click({ force: true })

// TODO(IL, 2021-05-15): give Dropdown component semantic selectors for E2E
cy.get('label')
.contains('What type of labware are you creating?')
.children()
.first()
.trigger('mousedown')
cy.get('*[class^="Dropdown__option_label"]')
.contains('Tubes / Plates + Opentrons Aluminum Block')
.click()

// TODO(IL, 2021-05-15): give Dropdown component semantic selectors for E2E
cy.get('label')
.contains('Which aluminum block?')
.children()
.first()
.trigger('mousedown')
cy.get('*[class^="Dropdown__option_label"]').contains('24 well').click()

cy.get('label')
.contains('What labware is on top of your aluminum block?')
.should('not.exist')

cy.contains('start creating labware').click({ force: true })
})

Expand Down Expand Up @@ -635,8 +736,15 @@ context('Tubes and Block', () => {

// Test pipette
cy.contains('Test Pipette is required').should('exist')
cy.contains('Select...').click({ force: true })
cy.contains('P10 Single').click({ force: true })
// TODO(IL, 2021-05-15): give Dropdown component semantic selectors for E2E
cy.get('label')
.contains('Test Pipette')
.children()
.first()
.trigger('mousedown')
cy.get('*[class^="Dropdown__option_label"]')
.contains('P10 Single GEN1')
.click()
cy.contains('Test Pipette is required').should('not.exist')

// All fields present
Expand Down
Loading