Merge branch 'MDL-67727-master' of git://github.com/crazyserver/moodle
commit
39d10d142e
|
@ -85,6 +85,10 @@ class behat_app extends behat_base {
|
||||||
$this->getSession()->restart();
|
$this->getSession()->restart();
|
||||||
$this->resize_window('360x720', true);
|
$this->resize_window('360x720', true);
|
||||||
|
|
||||||
|
if (empty($this->ionicurl)) {
|
||||||
|
$this->ionicurl = $this->start_or_reuse_ionic();
|
||||||
|
}
|
||||||
|
|
||||||
// Go to page and prepare browser for app.
|
// Go to page and prepare browser for app.
|
||||||
$this->prepare_browser($this->ionicurl);
|
$this->prepare_browser($this->ionicurl);
|
||||||
}
|
}
|
||||||
|
@ -241,6 +245,7 @@ class behat_app extends behat_base {
|
||||||
// the process.
|
// the process.
|
||||||
self::$ionicrunning = (object)['url' => $url, 'process' => $process, 'pipes' => $pipes,
|
self::$ionicrunning = (object)['url' => $url, 'process' => $process, 'pipes' => $pipes,
|
||||||
'pid' => $pid];
|
'pid' => $pid];
|
||||||
|
$url = self::$ionicrunning->url;
|
||||||
}
|
}
|
||||||
return $url;
|
return $url;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue