Merge pull request #705 from mnocon/fix-adminui-tests

Łukasz Serwatka · web-flow · commit e3ada61eae37 · 2018-10-31T14:20:59.000+01:00
Fix Behat DateTime tests
diff --git a/src/lib/Behat/PageElement/DateAndTimePopup.php b/src/lib/Behat/PageElement/DateAndTimePopup.php
@@ -47,6 +47,7 @@ public function setDate(DateTime $date, string $dateFormat = self::DATETIME_FORM
 
         $dateToDiff = $this->deleteDayFromDate($date);
         $currentDateToDiff = $this->deleteDayFromDate($currentDate);
+        $dateToDiff->modify('+1 day');
         $interval = $dateToDiff->diff($currentDateToDiff);
         $monthsDiff = 12 * $interval->y + $interval->m;
 
@@ -70,7 +71,7 @@ public function setDate(DateTime $date, string $dateFormat = self::DATETIME_FORM
 
     public function deleteDayFromDate(DateTime $dateTime): DateTime
     {
-        return DateTime::createFromFormat('Y-m', $dateTime->format('Y-m'));
+        return DateTime::createFromFormat('!Y-m', $dateTime->format('Y-m'));
     }
 
     public function switchToNextMonth(): void

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ public function setDate(DateTime $date, string $dateFormat = self::DATETIME_FORM`
`47`	`47`
`48`	`48`	`$dateToDiff = $this->deleteDayFromDate($date);`
`49`	`49`	`$currentDateToDiff = $this->deleteDayFromDate($currentDate);`
	`50`	`+ $dateToDiff->modify('+1 day');`
`50`	`51`	`$interval = $dateToDiff->diff($currentDateToDiff);`
`51`	`52`	`$monthsDiff = 12 * $interval->y + $interval->m;`
`52`	`53`
`@@ -70,7 +71,7 @@ public function setDate(DateTime $date, string $dateFormat = self::DATETIME_FORM`
`70`	`71`
`71`	`72`	`public function deleteDayFromDate(DateTime $dateTime): DateTime`
`72`	`73`	`{`
`73`		`- return DateTime::createFromFormat('Y-m', $dateTime->format('Y-m'));`
	`74`	`+ return DateTime::createFromFormat('!Y-m', $dateTime->format('Y-m'));`
`74`	`75`	`}`
`75`	`76`
`76`	`77`	`public function switchToNextMonth(): void`