Merge pull request #674 from ezsystems/adjust-dbp-tests

[Behat] Adjust tests for inlined date picker
ezsystems · Oct 8, 2018 · 0150c5a · 0150c5a
2 parents d4f2356 + 86a2aec
commit 0150c5a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/lib/Behat/PageElement/DateAndTimePopup.php b/src/lib/Behat/PageElement/DateAndTimePopup.php
@@ -16,11 +16,12 @@ class DateAndTimePopup extends Element
 
     private const DATETIME_FORMAT = 'm/d/Y, g:i:s a';
 
-    public function __construct(UtilityContext $context)
+    public function __construct(UtilityContext $context, bool $isInline = false)
     {
         parent::__construct($context);
+        $calendarSelector = $isInline ? '.flatpickr-calendar.inline' : '.flatpickr-calendar.open';
         $this->fields = [
-            'openedCalendar' => '.flatpickr-calendar.open',
+            'openedCalendar' => $calendarSelector,
             'pickerDaySelector' => '.flatpickr-day:not(.prevMonthDay):not(.nextMonthDay)',
             'pickerDayValue' => 'aria-label',
             'hourSelector' => '.flatpickr-hour',

diff --git a/src/lib/Behat/PageElement/PlatformElementFactory.php b/src/lib/Behat/PageElement/PlatformElementFactory.php
@@ -157,7 +157,11 @@ public static function createElement(UtilityContext $context, string $elementNam
             case LanguagePicker::ELEMENT_NAME:
                 return new LanguagePicker($context);
             case DateAndTimePopup::ELEMENT_NAME:
-                return new DateAndTimePopup($context);
+                if (!array_key_exists(0, $parameters)) {
+                    return new DateAndTimePopup($context);
+                }
+
+                return new DateAndTimePopup($context, $parameters[0]);
             case ContentTypePicker::ELEMENT_NAME:
                 return new ContentTypePicker($context);
             case UniversalDiscoveryWidget::ELEMENT_NAME: