tonyair/silverstripe-behat-extension
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-behat-extension synced 2024-10-22 17:05:32 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '5.0' into 5

Browse Source
This commit is contained in:
github-actions 2023-12-23 14:23:24 +00:00
commit 99fd1ac53b
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/Context/BasicContext.php
View File

@ -11,6 +11,7 @@ use Behat\Behat\Hook\Scope\AfterScenarioScope;
use Behat\Behat\Hook\Scope\AfterStepScope; use Behat\Behat\Hook\Scope\AfterStepScope;
use Behat\Behat\Hook\Scope\BeforeScenarioScope; use Behat\Behat\Hook\Scope\BeforeScenarioScope;
use Behat\Behat\Hook\Scope\BeforeStepScope; use Behat\Behat\Hook\Scope\BeforeStepScope;
use Behat\Mink\Driver\Selenium2Driver;
use Behat\Mink\Element\NodeElement; use Behat\Mink\Element\NodeElement;
use Behat\Mink\Exception\ElementNotFoundException; use Behat\Mink\Exception\ElementNotFoundException;
use Behat\Mink\Session; use Behat\Mink\Session;
@ -562,7 +563,12 @@ JS;
*/ */
public function iSeeTheDialogText($expected) public function iSeeTheDialogText($expected)
{ {
$text = $this->getExpectedAlert()->getText(); $driver = $this->getSession()->getDriver();
if ($driver instanceof Selenium2Driver) {
$text = $driver->getWebDriverSession()->getAlert_text();
} else {
$text = $this->getExpectedAlert()->getText();
}
Assert::assertStringContainsString($expected, $text); Assert::assertStringContainsString($expected, $text);
} }
@ -597,12 +603,17 @@ JS;
*/ */
public function iConfirmTheDialog() public function iConfirmTheDialog()
{ {
$session = $this->getWebDriverSession(); $driver = $this->getSession()->getDriver();
$session->wait()->until( if ($driver instanceof Selenium2Driver) {
WebDriverExpectedCondition::alertIsPresent(), $driver->getWebDriverSession()->accept_alert();
"Alert is expected" } else {
); $session = $this->getWebDriverSession();
$session->switchTo()->alert()->accept(); $session->wait()->until(
WebDriverExpectedCondition::alertIsPresent(),
"Alert is expected"
);
$session->switchTo()->alert()->accept();
}
$this->handleAjaxTimeout(); $this->handleAjaxTimeout();
} }
@ -611,7 +622,12 @@ JS;
*/ */
public function iDismissTheDialog() public function iDismissTheDialog()
{ {
$this->getExpectedAlert()->dismiss(); $driver = $this->getSession()->getDriver();
if ($driver instanceof Selenium2Driver) {
$driver->getWebDriverSession()->dismiss_alert();
} else {
$this->getExpectedAlert()->dismiss();
}
$this->handleAjaxTimeout(); $this->handleAjaxTimeout();
} }