diff --git a/tests/features/varbase/step2-apply-tests/02-user-management/02-01-request-new-password.feature b/tests/features/varbase/step2-apply-tests/02-user-management/02-01-request-new-password.feature
index 4aa262e0bbc5f816ea2bee140a4e81e979fc69d8..740f64e193b310d191717f88c19550d665fd0fb4 100644
--- a/tests/features/varbase/step2-apply-tests/02-user-management/02-01-request-new-password.feature
+++ b/tests/features/varbase/step2-apply-tests/02-user-management/02-01-request-new-password.feature
@@ -22,7 +22,7 @@ So that I can reset my password for the account
And I wait
Then I should see "There was a problem with your form submission. Please wait 6 seconds and try again."
When I fill in "not.existing.email@vardot.com" for "Username or email address"
- And I wait 7s
+ And I wait 8 seconds
And I press the "Submit" button
And I wait
- Then I should see "Further instructions have been sent to your e-mail address."
+ Then I should see "Login with"
diff --git a/tests/features/varbase/step2-apply-tests/03-admin-management/03-04-image-media-and-their-usage-list-page-for-admins.feature b/tests/features/varbase/step2-apply-tests/03-admin-management/03-04-image-media-and-their-usage-list-page-for-admins.feature
index ec399414c26fb3e688c10d99760a8b5f624e3240..d4332e589d0b83c6715ea267de61f331aec32293 100644
--- a/tests/features/varbase/step2-apply-tests/03-admin-management/03-04-image-media-and-their-usage-list-page-for-admins.feature
+++ b/tests/features/varbase/step2-apply-tests/03-admin-management/03-04-image-media-and-their-usage-list-page-for-admins.feature
@@ -18,7 +18,7 @@ So that I will be able to manage files, see where they have been used in content
When I go to "/media/add/image"
And I wait
Then I should see "Allowed types: png gif jpg jpeg."
- When I attach the file "flag-earth.jpg" to "Image"
+ When I attach the file "flag-earth.jpg" to "edit-field-media-image-0-upload"
And I wait
And I press the "Save" button
And I wait
@@ -40,7 +40,7 @@ So that I will be able to manage files, see where they have been used in content
And I wait
Then I should see "Add media"
When I fill in "Flag Earth" for "edit-name"
- And I press the "Apply" button
+ And I press the "Filter" button
And I wait
Then I should see "Flag Earth"
When I click "Edit" in the "Flag Earth" row
diff --git a/tests/features/varbase/step2-apply-tests/04-content-structure/04-03-landing-page_add-any-paragraph-type-to-the-page.feature b/tests/features/varbase/step2-apply-tests/04-content-structure/04-03-landing-page_add-any-paragraph-type-to-the-page.feature
index 83de1868c61cda5d11994e9a0ac13ce4fa4f9626..c3d001c3348c617ea6da3cc86b6970ee855d7b13 100644
--- a/tests/features/varbase/step2-apply-tests/04-content-structure/04-03-landing-page_add-any-paragraph-type-to-the-page.feature
+++ b/tests/features/varbase/step2-apply-tests/04-content-structure/04-03-landing-page_add-any-paragraph-type-to-the-page.feature
@@ -9,7 +9,7 @@ So that the "Landing page" will show up having paragrpahs of different types
When I go to "media/add/image"
And I wait
Then I should see "Allowed types: png gif jpg jpeg."
- When I attach the file "flag-earth.jpg" to "Image"
+ When I attach the file "flag-earth.jpg" to "edit-field-media-image-0-upload"
And I wait
And I press the "Save" button
And I wait
@@ -41,7 +41,7 @@ So that the "Landing page" will show up having paragrpahs of different types
And I fill in "Test Landing page description Drupal Block" for "Page description"
And I wait for AJAX to finish
And I wait for 1 second
- And I press "+ Add"
+ And I press "Add Component"
And I wait for AJAX to finish
And I wait for 1 second
And I select the "bp_block" paragraph component
@@ -62,7 +62,7 @@ So that the "Landing page" will show up having paragrpahs of different types
And I fill in "Test Landing page description Columns (Equal)" for "Page description"
And I wait for AJAX to finish
And I wait for 1 second
- And I press "+ Add"
+ And I press "Add Component"
And I wait for AJAX to finish
And I wait for 1 second
And I select the "bp_columns" paragraph component
@@ -80,7 +80,7 @@ So that the "Landing page" will show up having paragrpahs of different types
And I fill in "Test Landing page description Columns (Two Uneven)" for "Page description"
And I wait for AJAX to finish
And I wait for 1 second
- And I press "+ Add"
+ And I press "Add Component"
And I wait for AJAX to finish
And I wait for 1 second
And I select the "bp_columns_two_uneven" paragraph component
@@ -98,7 +98,7 @@ So that the "Landing page" will show up having paragrpahs of different types
And I fill in "Test Landing page description Modal" for "Page description"
And I wait for AJAX to finish
And I wait for 1 second
- And I press "+ Add"
+ And I press "Add Component"
And I wait for AJAX to finish
And I wait for 1 second
And I select the "bp_modal" paragraph component
@@ -128,7 +128,7 @@ So that the "Landing page" will show up having paragrpahs of different types
And I fill in "Test Landing page description Rich Text" for "Page description"
And I wait for AJAX to finish
And I wait for 1 second
- And I press "+ Add"
+ And I press "Add Component"
And I wait for AJAX to finish
And I wait for 1 second
And I select the "bp_simple" paragraph component
@@ -149,7 +149,7 @@ So that the "Landing page" will show up having paragrpahs of different types
And I fill in "Test Landing page description Tabs" for "Page description"
And I wait for AJAX to finish
And I wait for 1 second
- And I press "+ Add"
+ And I press "Add Component"
And I wait for AJAX to finish
And I wait for 1 second
And I select the "bp_tabs" paragraph component
@@ -176,7 +176,7 @@ So that the "Landing page" will show up having paragrpahs of different types
And I fill in "Test Landing page description WebForm" for "Page description"
And I wait for AJAX to finish
And I wait for 1 second
- And I press "+ Add"
+ And I press "Add Component"
And I wait for AJAX to finish
And I wait for 1 second
And I select the "bp_webform" paragraph component
diff --git a/tests/features/varbase/step2-apply-tests/04-content-structure/04-04-landing-page_text-and-image-paragraphs.feature b/tests/features/varbase/step2-apply-tests/04-content-structure/04-04-landing-page_text-and-image-paragraphs.feature
index 08047f3bce62440ea2c7fbd1c6599d69674ba149..66d5e0be696675ff3ba58915ee9ef3d89791da57 100644
--- a/tests/features/varbase/step2-apply-tests/04-content-structure/04-04-landing-page_text-and-image-paragraphs.feature
+++ b/tests/features/varbase/step2-apply-tests/04-content-structure/04-04-landing-page_text-and-image-paragraphs.feature
@@ -9,7 +9,7 @@ So that the "Landing page" will have text and images in right and left view.
When I go to "media/add/image"
And I wait
Then I should see "Allowed types: png gif jpg jpeg."
- When I attach the file "flag-earth.jpg" to "Image"
+ When I attach the file "flag-earth.jpg" to "edit-field-media-image-0-upload"
And I wait
And I press the "Save" button
And I wait
diff --git a/tests/features/varbase/step2-apply-tests/04-content-structure/04-08-landing-page-layout-builder_check-to-add-sections-and-choose-layouts-for-sections.feature b/tests/features/varbase/step2-apply-tests/04-content-structure/04-08-landing-page-layout-builder_check-to-add-sections-and-choose-layouts-for-sections.feature
index c10d43136e3184d21bb04578227eb65267671513..cfa6a2f6fc85695a332af7c1ad51f73dfff3ba1b 100644
--- a/tests/features/varbase/step2-apply-tests/04-content-structure/04-08-landing-page-layout-builder_check-to-add-sections-and-choose-layouts-for-sections.feature
+++ b/tests/features/varbase/step2-apply-tests/04-content-structure/04-08-landing-page-layout-builder_check-to-add-sections-and-choose-layouts-for-sections.feature
@@ -18,7 +18,6 @@ So that the "Landing (Layout Builder) page" will show up having the listed secti
When I click "Layout"
And I wait
Then I should see "Edit layout for Full Width - No Background Color - Text only"
-# Add Section 1 as one column
When I click "Add section"
And I wait for AJAX to finish
Then I should see "Choose a layout for this section"
diff --git a/tests/features/varbase/step2-apply-tests/05-content-management/05-00-add-default-entityqueue-testing-content-and-config.feature b/tests/features/varbase/step2-apply-tests/05-content-management/05-00-add-default-entityqueue-testing-content-and-config.feature
index 95882464fdc1c2c540464381faaad94d501aa689..36738eeaf4867e4f9db9792920bbd8d5bc170013 100644
--- a/tests/features/varbase/step2-apply-tests/05-content-management/05-00-add-default-entityqueue-testing-content-and-config.feature
+++ b/tests/features/varbase/step2-apply-tests/05-content-management/05-00-add-default-entityqueue-testing-content-and-config.feature
@@ -8,7 +8,7 @@ Scenario: Create Test Content type
Then I should see "Add content type"
When I fill in "Test Content" for "Name"
And I wait for AJAX to finish
- And I wait for 1 second
+ And I wait for 2 seconds
And I press "Save and manage fields"
And I wait
Then I should see "The content type Test Content has been added."
@@ -24,8 +24,8 @@ Scenario: Add Entity Queue Test Queue and use Test Content type
Then I should see "Configure entity queue"
When I fill in "Test Queue" for "Name"
And I wait for AJAX to finish
- And I wait for 1 second
- And I click "Entity settings"
+ And I wait for 2 seconds
+ And I press "Entity settings"
And I wait
Then I should see "Content type"
When I check the box "Test Content"
diff --git a/tests/features/varbase/step2-apply-tests/05-content-management/05-03-add-hero-slider-to-entityqueue-using-entityqueue-form-widget.feature b/tests/features/varbase/step2-apply-tests/05-content-management/05-03-add-hero-slider-to-entityqueue-using-entityqueue-form-widget.feature
index c5c7189e4842f2cd06bb5a4449c70ce95246d3eb..336d5eee61ca0a24b5be91aa459faec788028bff 100644
--- a/tests/features/varbase/step2-apply-tests/05-content-management/05-03-add-hero-slider-to-entityqueue-using-entityqueue-form-widget.feature
+++ b/tests/features/varbase/step2-apply-tests/05-content-management/05-03-add-hero-slider-to-entityqueue-using-entityqueue-form-widget.feature
@@ -8,7 +8,7 @@ I want to be able to add and remove entities to any allowed entity queue.
When I go to "media/add/image"
And I wait
Then I should see "Allowed types: png gif jpg jpeg."
- When I attach the file "flag-earth.jpg" to "Image"
+ When I attach the file "flag-earth.jpg" to "edit-field-media-image-0-upload"
And I wait
And I press the "Save" button
And I wait
diff --git a/tests/features/varbase/step2-apply-tests/05-content-management/05-04-cloning-content-and-entities.feature b/tests/features/varbase/step2-apply-tests/05-content-management/05-04-cloning-content-and-entities.feature
index 710cb2e11f6b4cc6160c0df655ba45dfa40801a4..98338154672d4260b0710a46990227bf2ae6ff3f 100644
--- a/tests/features/varbase/step2-apply-tests/05-content-management/05-04-cloning-content-and-entities.feature
+++ b/tests/features/varbase/step2-apply-tests/05-content-management/05-04-cloning-content-and-entities.feature
@@ -11,7 +11,7 @@ I want to be able to clone an entity.
And I fill in "Test landing page description text" for "Page description"
And I wait for AJAX to finish
And I wait for 1 second
- And I press "+ Add"
+ And I press "Add Component"
And I wait for AJAX to finish
And I select the "bp_modal" paragraph component
And I wait for AJAX to finish
diff --git a/tests/features/varbase/step2-apply-tests/05-content-management/05-05-embed-existing-media-image-library.feature b/tests/features/varbase/step2-apply-tests/05-content-management/05-05-embed-existing-media-image-library.feature
index 5d3e58fd9cc1c6a7b8d83f7e05673280a2faeb0d..1e73704158ad2d8fb8e023ddda2d2fa967f51147 100644
--- a/tests/features/varbase/step2-apply-tests/05-content-management/05-05-embed-existing-media-image-library.feature
+++ b/tests/features/varbase/step2-apply-tests/05-content-management/05-05-embed-existing-media-image-library.feature
@@ -23,7 +23,7 @@ So that it will show up under that rich text field without having to upload the
When I go to "/media/add/image"
And I wait
Then I should see "Allowed types: png gif jpg jpeg."
- When I attach the file "flag-earth.jpg" to "Image"
+ When I attach the file "flag-earth.jpg" to "edit-field-media-image-0-upload"
And I wait
And I press the "Save" button
And I wait