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

Merge pull request #178 from open-sausages/pulls/1.0/fix-3-7-regression 

BUG Fix error when running on ss 3.7
This commit is contained in:
Robbie Averill 2018-06-02 18:38:40 +12:00 committed by GitHub
parent 8bb5ff5a1f 3f1f623f19
commit 35a5f450f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/SilverStripe/BehatExtension/Context/BasicContext.php
View File

@ -843,7 +843,7 @@ JS;
public function iWaitXUntilISee($wait, $selector) { public function iWaitXUntilISee($wait, $selector) {
$page = $this->getSession()->getPage(); $page = $this->getSession()->getPage();
$this->spin(function($page) use ($page, $selector){ $this->spin(function() use ($page, $selector){
$element = $page->find('css', $selector); $element = $page->find('css', $selector);
if(empty($element)) { if(empty($element)) {
@ -864,7 +864,7 @@ JS;
*/ */
public function iWaitUntilISee($selector) { public function iWaitUntilISee($selector) {
$page = $this->getSession()->getPage(); $page = $this->getSession()->getPage();
$this->spin(function($page) use ($page, $selector){ $this->spin(function() use ($page, $selector){
$element = $page->find('css', $selector); $element = $page->find('css', $selector);
if(empty($element)){ if(empty($element)){
return false; return false;
@ -885,7 +885,7 @@ JS;
public function iWaitUntilISeeText($text){ public function iWaitUntilISeeText($text){
$page = $this->getSession()->getPage(); $page = $this->getSession()->getPage();
$session = $this->getSession(); $session = $this->getSession();
$this->spin(function($page) use ($page, $session, $text) { $this->spin(function() use ($page, $session, $text) {
$element = $page->find( $element = $page->find(
'xpath', 'xpath',
$session->getSelectorsHandler()->selectorToXpath("xpath", ".//*[contains(text(), '$text')]") $session->getSelectorsHandler()->selectorToXpath("xpath", ".//*[contains(text(), '$text')]")

2
src/SilverStripe/BehatExtension/Context/FixtureContext.php
View File

@ -342,7 +342,7 @@ class FixtureContext extends BehatContext
\Versioned::reading_stage('Live'); \Versioned::reading_stage('Live');
$clone = clone $obj; $clone = clone $obj;
$clone->delete(); $clone->delete();
\Versioned::reading_stage($oldMode); \Versioned::set_reading_mode($oldMode);
break; break;
case 'deleted': case 'deleted':
$obj->delete(); $obj->delete();