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

BUG Fix ajax loading wait for behat tests

Browse Source 
Requires https://github.com/silverstripe/silverstripe-behat-extension/pull/169
This commit is contained in:
Damian Mooyman 2017-08-02 10:53:57 +12:00
parent f36f085d9f
commit 6853204504
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/behat/src/CmsUiContext.php
View File

@ -2,6 +2,8 @@
namespace SilverStripe\Framework\Tests\Behaviour; namespace SilverStripe\Framework\Tests\Behaviour;
use Behat\Behat\Hook\Call\AfterStep;
use Behat\Behat\Hook\Scope\AfterStepScope;
use Behat\Mink\Element\NodeElement; use Behat\Mink\Element\NodeElement;
use Behat\Mink\Session; use Behat\Mink\Session;
use Behat\Behat\Context\Context; use Behat\Behat\Context\Context;
@ -42,10 +44,16 @@ class CmsUiContext implements Context
* Excluding scenarios with @modal tag is required, * Excluding scenarios with @modal tag is required,
* because modal dialogs stop any JS interaction * because modal dialogs stop any JS interaction
* *
* @AfterStep ~@modal * @AfterStep
* @param AfterStepScope $event
*/ */
public function handleCmsLoadingAfterStep(StepEvent $event) public function handleCmsLoadingAfterStep(AfterStepScope $event)
{ {
// Manually exclude @modal
if ($this->stepHasTag($event, 'modal')) {
return;
}
$timeoutMs = $this->getMainContext()->getAjaxTimeout(); $timeoutMs = $this->getMainContext()->getAjaxTimeout();
$this->getSession()->wait( $this->getSession()->wait(
$timeoutMs, $timeoutMs,