From 86a2aec560a036022e202faac2ed8fba9c5143c1 Mon Sep 17 00:00:00 2001 From: Marek Nocon Date: Mon, 8 Oct 2018 09:55:50 +0200 Subject: [PATCH] [Behat] Adjust tests for inlined date picker --- src/lib/Behat/PageElement/DateAndTimePopup.php | 5 +++-- src/lib/Behat/PageElement/PlatformElementFactory.php | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/lib/Behat/PageElement/DateAndTimePopup.php b/src/lib/Behat/PageElement/DateAndTimePopup.php index 512647226e..89811aea02 100644 --- 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 index 073a2481ac..ffb510c24f 100644 --- 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: