tonyair
/
silverstripe-behat-extension
mirror of https://github.com/silverstripe/silverstripe-behat-extension
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '4.9' into 4

This commit is contained in:
Steve Boyd 2022-07-25 17:06:57 +12:00
parent 984c1fbd04 7bb03997cf
commit e5e6c7256a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Context/LoginContext.php
View File

@ -104,8 +104,8 @@ class LoginContext implements Context
if ($btn->getText() !== 'Setup later') { if ($btn->getText() !== 'Setup later') {
continue; continue;
} }
// There's been issues clicking the button, so try waiting for a little bit // There's been issues clicking the button, so try waiting for 0.3 seconds
sleep(0.3); usleep(0.3 * 1000000);
$btn->click(); $btn->click();
$clicked = true; $clicked = true;
break; break;

2
src/Context/SilverStripeContext.php
View File

@ -510,7 +510,7 @@ abstract class SilverStripeContext extends MinkContext implements SilverStripeAw
} }
$state = $this->testSessionEnvironment->getState(); $state = $this->testSessionEnvironment->getState();
$oldDatetime = \DateTime::createFromFormat('Y-m-d H:i:s', isset($state->datetime) ? $state->datetime : null); $oldDatetime = \DateTime::createFromFormat('Y-m-d H:i:s', $state->datetime ?? '');
if ($oldDatetime) { if ($oldDatetime) {
$newDatetime->setTime($oldDatetime->format('H'), $oldDatetime->format('i'), $oldDatetime->format('s')); $newDatetime->setTime($oldDatetime->format('H'), $oldDatetime->format('i'), $oldDatetime->format('s'));
} }