feat(protocol-designer, step-generation): x/Y tip positioning for asp…

…, disp, mix (#14758) closes AUTH-5
Opentrons · May 20, 2024 · cef6173 · cef6173
1 parent bc91c4a
commit cef6173
Show file tree

Hide file tree

Showing 50 changed files with 3,054 additions and 981 deletions.
diff --git a/protocol-designer/cypress/integration/mixSettings.spec.js b/protocol-designer/cypress/integration/mixSettings.spec.js
@@ -59,7 +59,7 @@ describe('Advanced Settings for Mix Form', () => {
     cy.get('input[name="aspirate_flowRate"]').should('be.disabled')
 
     // TipPosition Aspirate should be disabled
-    cy.get('[id=TipPositionField_mix_mmFromBottom]').should('be.disabled')
+    cy.get('[id=TipPositionIcon_mix_mmFromBottom]').should('not.be.enabled')
 
     // Dispense Flowrate disbled
     cy.get('input[name="dispense_flowRate"]').should('be.disabled')
@@ -91,7 +91,7 @@ describe('Advanced Settings for Mix Form', () => {
     cy.get('input[name="dispense_flowRate"]').should('be.enabled')
 
     // TipPosition Aspirate should be enabled
-    cy.get('[id=TipPositionField_mix_mmFromBottom]').should('be.enabled')
+    cy.get('[id=TipPositionIcon_mix_mmFromBottom]').should('not.be.disabled')
 
     // Delay in aspirate and Dispense settings is enabled
     cy.get('input[name="aspirate_delay_checkbox"]').should('be.enabled')

diff --git a/protocol-designer/cypress/integration/transferSettings.spec.js b/protocol-designer/cypress/integration/transferSettings.spec.js
@@ -53,7 +53,7 @@ describe('Advanced Settings for Transfer Form', () => {
   it('Verify functionality of advanced settings with different pipette and labware', () => {
     enterBatchEdit()
 
-    // Different Pipette disbales aspirate and dispense Flowrate and Mix settings
+    // Different Pipette disables aspirate and dispense Flowrate and Mix settings
     // step 6 has different pipette than step 1
     cy.get('[data-test="StepItem_6"]').click(batchEditClickOptions)
 
@@ -68,10 +68,14 @@ describe('Advanced Settings for Transfer Form', () => {
     cy.get('input[name="aspirate_mix_checkbox"]').should('be.disabled')
 
     // TipPosition Aspirate and Dispense should be disabled
-    cy.get('[id=TipPositionField_aspirate_mmFromBottom]').should('be.disabled')
-    cy.get('[id=TipPositionField_dispense_mmFromBottom]').should('be.disabled')
+    cy.get('[id=TipPositionIcon_aspirate_mmFromBottom]').should(
+      'not.be.enabled'
+    )
+    cy.get('[id=TipPositionIcon_dispense_mmFromBottom]').should(
+      'not.be.enabled'
+    )
 
-    // Dispense Flowrate and mix diabled
+    // Dispense Flowrate and mix disabled
     cy.get('input[name="dispense_flowRate"]').should('be.disabled')
     cy.get('input[name="dispense_mix_checkbox"]').should('be.disabled')
 
@@ -108,8 +112,12 @@ describe('Advanced Settings for Transfer Form', () => {
       .should('be.empty')
 
     // TipPosition Aspirate and Dispense should be enabled
-    cy.get('[id=TipPositionField_aspirate_mmFromBottom]').should('be.enabled')
-    cy.get('[id=TipPositionField_dispense_mmFromBottom]').should('be.enabled')
+    cy.get('[id=TipPositionIcon_aspirate_mmFromBottom]').should(
+      'not.be.disabled'
+    )
+    cy.get('[id=TipPositionIcon_dispense_mmFromBottom]').should(
+      'not.be.disabled'
+    )
 
     // Delay in aspirate and Dispense settings is enabled
     cy.get('input[name="aspirate_delay_checkbox"]').should('be.enabled')