refactoring complete

Opentrons · Jan 24, 2025 · 2d0c5bd · 2d0c5bd
1 parent 7a5cda0
commit 2d0c5bd
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 58 deletions.
diff --git a/protocol-designer/cypress/e2e/ProtocolDesignerModulesTest.cy.ts b/protocol-designer/cypress/e2e/ProtocolDesignerModulesTest.cy.ts
@@ -77,7 +77,6 @@ describe('The Redesigned Create Protocol Landing Page', () => {
       ModVerifications.TempeDeckInitialForm,
       UniversalActions.Snapshot,
       ModActions.ActivateTempdeck,
-
       ModActions.InputTempDeck4,
       ModActions.SaveButtonTempdeck,
       ModActions.PauseAfterSettingTempdeck,
@@ -93,8 +92,6 @@ describe('The Redesigned Create Protocol Landing Page', () => {
       ModActions.AddTemperatureStep,
       ModActions.ActivateTempdeck,
       ModActions.InputTempDeck100,
-
-
     ]
     runSteps(steps)
   })

diff --git a/protocol-designer/cypress/e2e/transferSettings.cy.ts b/protocol-designer/cypress/e2e/transferSettings.cy.ts
@@ -1,5 +1,6 @@
-import { Actions, Verifications, runCreateTest } from '../support/SetupSteps'
+import { SetupActions, SetupVerifications } from '../support/SetupSteps'
 import { UniversalActions } from '../support/universalActions'
+import { runSteps, type StepsList } from '../support/StepExecution'
 
 describe('The Redesigned Create Protocol Landing Page', () => {
   beforeEach(() => {
@@ -11,67 +12,67 @@ describe('The Redesigned Create Protocol Landing Page', () => {
   it('content and step 1 flow works', () => {
     cy.clickCreateNew()
     cy.verifyCreateNewHeader()
-    const steps: Array<Actions | Verifications | UniversalActions> = [
-      Verifications.OnStep1,
-      Verifications.FlexSelected,
+    const steps: StepsList = [
+      SetupVerifications.OnStep1,
+      SetupVerifications.FlexSelected,
       UniversalActions.Snapshot,
-      Actions.SelectOT2,
-      Verifications.OT2Selected,
+      SetupActions.SelectOT2,
+      SetupVerifications.OT2Selected,
       UniversalActions.Snapshot,
-      Actions.SelectFlex,
-      Verifications.FlexSelected,
+      SetupActions.SelectFlex,
+      SetupVerifications.FlexSelected,
       UniversalActions.Snapshot,
-      Actions.Confirm,
-      Verifications.OnStep2,
-      Actions.SingleChannelPipette50,
-      Verifications.StepTwo50uL,
+      SetupActions.Confirm,
+      SetupVerifications.OnStep2,
+      SetupActions.SingleChannelPipette50,
+      SetupVerifications.StepTwo50uL,
       UniversalActions.Snapshot,
-      Actions.Confirm,
-      Verifications.StepTwoPart3,
+      SetupActions.Confirm,
+      SetupVerifications.StepTwoPart3,
       UniversalActions.Snapshot,
-      Actions.Confirm,
-      Verifications.OnStep3,
-      Actions.YesGripper,
-      Actions.Confirm,
-      Verifications.Step4Verification,
-      Actions.AddThermocycler,
-      Verifications.ThermocyclerImg,
-      Actions.AddHeaterShaker,
-      Verifications.HeaterShakerImg,
-      Actions.AddMagBlock,
-      Verifications.MagBlockImg,
-      Actions.AddTempdeck2,
-      Verifications.Tempdeck2Img,
-      Actions.Confirm,
-      Actions.Confirm,
-      Actions.Confirm,
-      Actions.EditProtocolA,
-      Actions.ChoseDeckSlotC2,
-      Actions.AddHardwareLabware,
-      Actions.ClickLabwareHeader,
-      Actions.ClickWellPlatesSection,
-      Actions.SelectArmadillo96WellPlate,
-      Actions.ChoseDeckSlotC2Labware,
-      Actions.AddLiquid,
-      Actions.ClickLiquidButton,
-      Actions.DefineLiquid,
-      Actions.LiquidSaveWIP,
-      Actions.WellSelector,
-      Actions.LiquidDropdown,
-      Verifications.LiquidPage,
+      SetupActions.Confirm,
+      SetupVerifications.OnStep3,
+      SetupActions.YesGripper,
+      SetupActions.Confirm,
+      SetupVerifications.Step4Verification,
+      SetupActions.AddThermocycler,
+      SetupVerifications.ThermocyclerImg,
+      SetupActions.AddHeaterShaker,
+      SetupVerifications.HeaterShakerImg,
+      SetupActions.AddMagBlock,
+      SetupVerifications.MagBlockImg,
+      SetupActions.AddTempdeck2,
+      SetupVerifications.Tempdeck2Img,
+      SetupActions.Confirm,
+      SetupActions.Confirm,
+      SetupActions.Confirm,
+      SetupActions.EditProtocolA,
+      SetupActions.ChoseDeckSlotC2,
+      SetupActions.AddHardwareLabware,
+      SetupActions.ClickLabwareHeader,
+      SetupActions.ClickWellPlatesSection,
+      SetupActions.SelectArmadillo96WellPlate,
+      SetupActions.ChoseDeckSlotC2Labware,
+      SetupActions.AddLiquid,
+      SetupActions.ClickLiquidButton,
+      SetupActions.DefineLiquid,
+      SetupActions.LiquidSaveWIP,
+      SetupActions.WellSelector,
+      SetupActions.LiquidDropdown,
+      SetupVerifications.LiquidPage,
       UniversalActions.Snapshot,
-      Actions.SelectLiquidWells,
-      Actions.SetVolumeAndSaveforWells,
-      Actions.ChoseDeckSlotC3,
-      Actions.AddHardwareLabware,
-      Actions.ClickLabwareHeader,
-      Actions.ClickWellPlatesSection,
-      Actions.SelectBioRad96WellPlate,
-      Actions.ProtocolStepsH,
-      Actions.AddStep,
-      Verifications.TransferPopOut,
+      SetupActions.SelectLiquidWells,
+      SetupActions.SetVolumeAndSaveforWells,
+      SetupActions.ChoseDeckSlotC3,
+      SetupActions.AddHardwareLabware,
+      SetupActions.ClickLabwareHeader,
+      SetupActions.ClickWellPlatesSection,
+      SetupActions.SelectBioRad96WellPlate,
+      SetupActions.ProtocolStepsH,
+      SetupActions.AddStep,
+      SetupVerifications.TransferPopOut,
       UniversalActions.Snapshot,
     ]
-    runCreateTest(steps)
+    runSteps(steps)
   })
 })