mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-08-26 04:26:01 +02:00
Merge remote-tracking branch 'origin/3.1'
This commit is contained in:
commit
8092dfa3d5
@ -272,14 +272,16 @@ class CmsUiContext extends BehatContext
|
||||
public function iWaitForThePreviewToLoad()
|
||||
{
|
||||
$driver = $this->getSession()->getDriver();
|
||||
// TODO Remove once we have native support in Mink and php-webdriver,
|
||||
// see https://groups.google.com/forum/#!topic/behat/QNhOuGHKEWI
|
||||
$origWindowName = $driver->getWebDriverSession()->window_handle();
|
||||
|
||||
$driver->switchToIFrame('cms-preview-iframe');
|
||||
|
||||
$this->getSession()->wait(
|
||||
5000,
|
||||
"!jQuery('iframe[name=cms-preview-iframe]').hasClass('loading')"
|
||||
);
|
||||
|
||||
$driver->switchToWindow();
|
||||
$driver->switchToWindow($origWindowName);
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
Reference in New Issue
Block a user