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 remote-tracking branch 'origin/3.1'

Browse Source
This commit is contained in:
Ingo Schommer 2013-08-22 14:11:45 +02:00
commit 8092dfa3d5
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -272,14 +272,16 @@ class CmsUiContext extends BehatContext
public function iWaitForThePreviewToLoad() public function iWaitForThePreviewToLoad()
{ {
$driver = $this->getSession()->getDriver(); $driver = $this->getSession()->getDriver();
$driver->switchToIFrame('cms-preview-iframe'); // 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( $this->getSession()->wait(
5000, 5000,
"!jQuery('iframe[name=cms-preview-iframe]').hasClass('loading')" "!jQuery('iframe[name=cms-preview-iframe]').hasClass('loading')"
); );
$driver->switchToWindow($origWindowName);
$driver->switchToWindow();
} }
/** /**