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

Merge pull request #7230 from open-sausages/pulls/4.0/fix-behat-wait 

BUG Fix ajax loading wait for behat tests
This commit is contained in:
Chris Joe 2017-08-02 12:09:49 +12:00 committed by GitHub
parent 04c46aed6c 6853204504
commit 73eb82f2b1
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;
use Behat\Behat\Hook\Call\AfterStep;
use Behat\Behat\Hook\Scope\AfterStepScope;
use Behat\Mink\Element\NodeElement;
use Behat\Mink\Session;
use Behat\Behat\Context\Context;
@ -42,10 +44,16 @@ class CmsUiContext implements Context
* Excluding scenarios with @modal tag is required,
* 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();
$this->getSession()->wait(
$timeoutMs,