From 28ebb255eee9a351253e60c6d327fa004e2a3c89 Mon Sep 17 00:00:00 2001
From: Rajab Natshah <rajabn@gmail.com>
Date: Sun, 28 Nov 2021 21:18:07 +0200
Subject: [PATCH] Issue #3251531: Start a 9.1.x branch for Varbase and Varbase
Project to support Bootstrap 5
---
tests/features/bootstrap/VarbaseContext.php | 24 +++++++++----------
...-important-admin-development-pages.feature | 2 +-
...ragraphs_text-and-image-paragraphs.feature | 4 ++--
...ns-and-choose-layouts-for-sections.feature | 1 +
4 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/tests/features/bootstrap/VarbaseContext.php b/tests/features/bootstrap/VarbaseContext.php
index 793d66dd..d0fb4d34 100644
--- a/tests/features/bootstrap/VarbaseContext.php
+++ b/tests/features/bootstrap/VarbaseContext.php
@@ -1500,13 +1500,13 @@ JS;
*
* Varbase Context #varbase.
*
- * Example #1: When I scrolldown
- * Example #2: And I scrolldown.
+ * Example #1: When I scroll down
+ * Example #2: And I scroll down.
*
- * @When /^(?:|I )scrolldown$/
+ * @When /^(?:|I )scroll down$/
*/
public function iScrolldown() {
- $this->getSession()->executeScript("javascript:window.scrollBy(200,350)");
+ $this->getSession()->executeScript("javascript:window.scrollBy(0,350)");
}
/**
@@ -1514,9 +1514,9 @@ JS;
*
* Varbase Context #varbase.
*
- * Example #1: When I scrollup.
+ * Example #1: When I scroll up.
*
- * @When /^(?:|I )scrollup$/
+ * @When /^(?:|I )scroll up$/
*/
public function iScrollup() {
$this->getSession()->executeScript("javascript:window.scrollBy(0,-350)");
@@ -1527,13 +1527,13 @@ JS;
*
* Varbase Context #varbase.
*
- * Example #1: When I scrolldown 800
- * Example #2: And I scrolldown 2000
+ * Example #1: When I scroll down 800
+ * Example #2: And I scroll down 2000
*
- * @When /^(?:|I )scrolldown (?P<value>\d+)$/
+ * @When /^(?:|I )scroll down (?P<value>\d+)$/
*/
public function iScrolldownWithValue($value) {
- $this->getSession()->executeScript("javascript:window.scrollBy(200," . $value . ")");
+ $this->getSession()->executeScript("javascript:window.scrollBy(0," . $value . ")");
}
/**
@@ -1541,9 +1541,9 @@ JS;
*
* Varbase Context #varbase.
*
- * Example #1: When I scrollup 1000
+ * Example #1: When I scroll up 1000
*
- * @When /^(?:|I ) scrollup (?P<value>\d+)$/
+ * @When /^(?:|I ) scroll up (?P<value>\d+)$/
*/
public function iScrollupWithValue($value) {
$this->getSession()->executeScript("javascript:window.scrollBy(0,-" . $value . ")");
diff --git a/tests/features/varbase/step2-apply-tests/03-admin-management/03-00-pre-check-important-admin-development-pages.feature b/tests/features/varbase/step2-apply-tests/03-admin-management/03-00-pre-check-important-admin-development-pages.feature
index 68323bf2..034afaef 100644
--- a/tests/features/varbase/step2-apply-tests/03-admin-management/03-00-pre-check-important-admin-development-pages.feature
+++ b/tests/features/varbase/step2-apply-tests/03-admin-management/03-00-pre-check-important-admin-development-pages.feature
@@ -84,7 +84,7 @@ So that I can use them after the install or update.
And I wait
Then I should see "Appearance"
And I should see "Vartheme"
- And I should see "Vartheme (Bootstrap 4 - SASS)"
+ And I should see "(Bootstrap 5 - SASS)"
And I should see "Claro"
And I should see "Bootstrap"
And I should see "Bootstrap Barrio"
diff --git a/tests/features/varbase/step2-apply-tests/04-content-structure/04-04-landing-page-paragraphs_text-and-image-paragraphs.feature b/tests/features/varbase/step2-apply-tests/04-content-structure/04-04-landing-page-paragraphs_text-and-image-paragraphs.feature
index 5d61cd5b..d33ab216 100644
--- a/tests/features/varbase/step2-apply-tests/04-content-structure/04-04-landing-page-paragraphs_text-and-image-paragraphs.feature
+++ b/tests/features/varbase/step2-apply-tests/04-content-structure/04-04-landing-page-paragraphs_text-and-image-paragraphs.feature
@@ -35,7 +35,7 @@ So that the "Landing page (Paragraphs)" will have text and images in right and l
And I wait for 1 second
And I select the "text_and_image" paragraph component
And I wait for AJAX to finish
- And I scrolldown
+ And I scroll down
Then I should see "Text and image"
And I should see "No media items are selected."
When I press "field_image-media-library-open-button-field_lp_paragraphs-0-subform"
@@ -49,7 +49,7 @@ So that the "Landing page (Paragraphs)" will have text and images in right and l
And I wait for AJAX to finish
And I press "dialog-submit"
And I wait for AJAX to finish
- And I scrollup
+ And I scroll up
Then I should see "The maximum number of media items have been selected."
When I click "Text"
And I fill in the rich text editor field "Text" with "In eros ipsum, mattis vitae vulputate eu, blandit non risus. Maecenas ultricies volutpat massa id hendrerit. Phasellus magna quam, lacinia sed justo pulvinar, tristique finibus felis. Quisque in sagittis tellus. Curabitur in est at quam maximus elementum. Pellentesque interdum tincidunt nisl, ac efficitur elit aliquam id. Integer egestas neque ut risus tincidunt semper."
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 514dc70e..4b8c71f3 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
@@ -17,6 +17,7 @@ So that the "Landing (Layout Builder) page" will show up having the listed secti
Then I should see "Landing page (Layout Builder) Full Width - No Background Color - Text only has been created"
And I should see "This layout builder tool allows you to configure the layout of the main content area."
When I scroll to the bottom of the page
+ And I wait 1s
Then I should see "Add section at end of layout"
When I click "Add section at end of layout"
And I wait for AJAX to finish
--
GitLab