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

Merge pull request #5370 from tractorcow/pulls/3/fix-behat-modal-error

Browse Source 
BUG Fix error when modals are displayed
This commit is contained in:
Ingo Schommer 2016-04-22 11:48:01 +12:00
commit cfd6cd259d
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php
View File

@ -2,16 +2,12 @@
namespace SilverStripe\Framework\Test\Behaviour;
use Behat\Behat\Context\ClosuredContextInterface,
Behat\Behat\Context\TranslatedContextInterface,
Behat\Behat\Context\BehatContext,
use Behat\Behat\Context\BehatContext,
Behat\Behat\Context\Step,
Behat\Behat\Event\StepEvent,
Behat\Behat\Exception\PendingException,
Behat\Mink\Exception\ElementNotFoundException,
Behat\Gherkin\Node\PyStringNode,
Behat\Gherkin\Node\TableNode,
Behat\Mink\Element\NodeElement;
Behat\Mink\Element\NodeElement,
Behat\Mink\Session,
WebDriver\Exception\UnexpectedAlertOpen;
// PHPUnit
@ -39,6 +35,8 @@ class CmsUiContext extends BehatContext {
/**
* Get Mink session from MinkContext
*
* @return Session
*/
public function getSession($name = null) {
return $this->getMainContext()->getSession($name);
@ -54,7 +52,10 @@ class CmsUiContext extends BehatContext {
* Every step could cause the CMS to be loaded, and we don't know if we're in the
* CMS UI until we run a check.
*
* @AfterStep
* Excluding scenarios with @modal tag is required,
* because modal dialogs stop any JS interaction
*
* @AfterStep ~@modal
*/
public function handleCmsLoadingAfterStep(StepEvent $event) {
$timeoutMs = $this->getMainContext()->getAjaxTimeout();