Skip to content

Commit 9662f91

Browse files
committed
Made significant progress on clicking all of the buttons for transfer
1 parent 8bdf0a7 commit 9662f91

2 files changed

Lines changed: 48 additions & 48 deletions

File tree

protocol-designer/cypress/e2e/transferSettings.cy.ts

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,25 @@ describe('The Redesigned Create Protocol Landing Page', () => {
9494
Verifications.TouchTip,
9595
Verifications.MixT,
9696
Verifications.AirGap,
97+
Actions.AspirateMixVolume,
98+
Actions.AspirateMixTimes,
99+
Actions.AspirateAirGapVolume,
100+
Actions.SelectDispense,
101+
Actions.DelayAspirate,
102+
Actions.TouchTipAspirate,
103+
Actions.MixAspirate,
104+
Actions.AirGapAspirate,
105+
Actions.DispenseMixVolume,
106+
Actions.DispenseMixTimes,
107+
Actions.DispenseAirGapVolume,
97108
]
98109
runCreateTest(steps)
99-
cy.get('input[name = "aspirate_mix_volume"]').type('20')
100-
cy.get('input[name = "aspirate_mix_times"]').type('2')
101-
cy.get('input[name = "aspirate_airGap_volume"]').type('10')
102-
cy.contains('Dispense').click()
110+
cy.contains('Blowout').closest('div').find('button').click()
111+
cy.contains('Blowout location')
112+
cy.contains('Blowout flow rate')
113+
cy.contains('Blowout position from top')
114+
cy.contains('Choose option').click()
115+
cy.contains('Destination Well').click()
116+
cy.contains('Save').click()
103117
})
104118
})

protocol-designer/cypress/support/createNew.ts

Lines changed: 30 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,13 @@ export enum Actions {
8686
TouchTipAspirate = 'Enable Touch tip for aspiration',
8787
MixAspirate = 'Enable Mix for aspiration',
8888
AirGapAspirate = 'Enable Air gap for aspiration',
89+
AspirateMixVolume = 'Mix volume for transfer aspirate',
90+
AspirateMixTimes = 'Mix times for transfer aspirate',
91+
AspirateAirGapVolume = 'Air gap volume for transfer aspirate',
92+
SelectDispense = 'Dispense tab in the transfer step form',
93+
DispenseMixVolume = 'Mix volume for transfer dispense',
94+
DispenseMixTimes = 'Mix times for transfer dispense',
95+
DispenseAirGapVolume = 'Air gap volume for transfer dispense',
8996
}
9097

9198
export enum Verifications {
@@ -521,18 +528,15 @@ const executeAction = (action: Actions | UniversalActions): void => {
521528
cy.contains('button', 'Transfer').should('be.visible').click()
522529
break
523530
case Actions.ChoseSourceLabware:
524-
cy.get('div.Flex-sc-1qhp8l7-0.sc-bqWxrE.jKLbYH.gEhMNQ')
525-
.eq(0)
526-
.contains('Choose option')
527-
.click()
531+
cy.contains('p', 'Choose option').closest('div[tabindex="0"]').click()
528532
// cy.contains('p', Content.ChoseOption).click()
529533
break
530534
case Actions.ChoseDestinationLabware:
535+
// ToDo: Please make a better selector
531536
cy.get('div.Flex-sc-1qhp8l7-0.sc-bqWxrE.jKLbYH.gEhMNQ')
532537
.eq(1)
533538
.contains('Choose option')
534539
.click()
535-
// cy.contains('p', Content.ChoseOption).click()
536540
break
537541
case Actions.AddSourceLabwareDropdown:
538542
cy.get(Locators.AspirateWells) // Use the `name` attribute
@@ -570,6 +574,27 @@ const executeAction = (action: Actions | UniversalActions): void => {
570574
case Actions.AirGapAspirate:
571575
cy.contains('Air gap').closest('div').find('button').click()
572576
break
577+
case Actions.AspirateMixVolume:
578+
cy.get('input[name = "aspirate_mix_volume"]').type('20')
579+
break
580+
case Actions.AspirateMixTimes:
581+
cy.get('input[name = "aspirate_mix_times"]').type('2')
582+
break
583+
case Actions.AspirateAirGapVolume:
584+
cy.get('input[name = "aspirate_airGap_volume"]').type('10')
585+
break
586+
case Actions.SelectDispense:
587+
cy.contains('Dispense').click()
588+
break
589+
case Actions.DispenseMixVolume:
590+
cy.get('input[name = "dispense_mix_volume"]').type('20')
591+
break
592+
case Actions.DispenseMixTimes:
593+
cy.get('input[name = "dispense_mix_times"]').type('2')
594+
break
595+
case Actions.DispenseAirGapVolume:
596+
cy.get('input[name = "dispense_airGap_volume"]').type('10')
597+
break
573598
default:
574599
throw new Error(`Unrecognized action: ${action as string}`)
575600
}
@@ -739,42 +764,3 @@ export const verifyCreateProtocolPage = (): void => {
739764
cy.contains(Content.OpentronsOT2).should('exist').should('be.visible')
740765
cy.contains(Content.Confirm).should('exist').should('be.visible')
741766
}
742-
/* Todo Evaluate if this is an easier option
743-
export const VerifyTransferPageStep1 = (): void => {
744-
cy.contains('Delay')
745-
.closest('div')
746-
.find('button')
747-
.find('svg')
748-
.should('exist')
749-
.and('have.attr', 'aria-hidden', 'true')
750-
751-
cy.contains('Pre-wet tip')
752-
.closest('div')
753-
.find('button')
754-
.find('svg')
755-
.should('exist')
756-
.and('have.attr', 'aria-hidden', 'true')
757-
758-
cy.contains('Touch tip')
759-
.closest('div')
760-
.find('button')
761-
.find('svg')
762-
.should('exist')
763-
.and('have.attr', 'aria-hidden', 'true')
764-
765-
cy.contains('Mix')
766-
.closest('div')
767-
.find('button')
768-
.find('svg')
769-
.should('exist')
770-
.and('have.attr', 'aria-hidden', 'true')
771-
772-
cy.contains('Air gap')
773-
.closest('div')
774-
.find('button')
775-
.find('svg')
776-
.should('exist')
777-
.and('have.attr', 'aria-hidden', 'true')
778-
// Verify step 1 and page content
779-
}
780-
*/

0 commit comments

Comments
 (0)