Merge branch '6.1' into 6

This commit is contained in:
Steve Boyd 2023-12-07 09:37:59 +13:00
commit d4378d6c75

View File

@ -50,16 +50,13 @@ Feature: Userforms
And I fill in "Form_Fields_GridFieldEditableColumns_7_Title" with "My upload field" And I fill in "Form_Fields_GridFieldEditableColumns_7_Title" with "My upload field"
# Weird behat limitation where the only the select field on the first row is selectable # Weird behat limitation where the only the select field on the first row is selectable
And I drag the ".ss-gridfield-item[data-id='7'] .handle" element to the ".ss-gridfield-item[data-id='2'] .handle" element And I drag the ".ss-gridfield-item[data-id='7'] .handle" element to the ".ss-gridfield-item[data-id='2'] .handle" element
# Behat sometimes messes up and doesn't correctly select the upload field if you don't give it a beat after reordering And I wait for 1 seconds
And I wait for 2 seconds
And I select "File Upload Field" from the "Form_Fields_GridFieldEditableColumns_7_ClassName" field
# Click save on the file upload modal to use the default "Form-submissions" folder # Click save on the file upload modal to use the default "Form-submissions" folder
And I press the "Save and continue" button
And I wait for 5 seconds
And I select "File Upload Field" from the "Form_Fields_GridFieldEditableColumns_7_ClassName" field And I select "File Upload Field" from the "Form_Fields_GridFieldEditableColumns_7_ClassName" field
And I press the "Save and continue" button And I press the "Save and continue" button
And I wait for 5 seconds And I wait for 2 seconds
And I press the "Publish" button And I press the "Publish" button
And I wait for 5 seconds
# Edit My textfield 3 # Edit My textfield 3
When I click on the ".ss-gridfield-item[data-id='6'] .edit-link" element When I click on the ".ss-gridfield-item[data-id='6'] .edit-link" element
@ -70,6 +67,7 @@ Feature: Userforms
# Drag and drop my text field 2 to Page Two # Drag and drop my text field 2 to Page Two
Then I drag the ".ss-gridfield-item[data-id='4'] .handle" element to the ".ss-gridfield-item[data-id='6'] .handle" element Then I drag the ".ss-gridfield-item[data-id='4'] .handle" element to the ".ss-gridfield-item[data-id='6'] .handle" element
And I wait for 1 seconds
And I press the "Publish" button And I press the "Publish" button
And I dismiss all toasts And I dismiss all toasts