Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

- Merge [956].

  • Loading branch information...
commit e005ab597c17eecf3768841f2a9f8b4858be2235 1 parent cbbbac5
@sebastianbergmann authored
Showing with 23 additions and 4 deletions.
  1. +23 −4 PHPUnit/Extensions/SeleniumTestCase.php
View
27 PHPUnit/Extensions/SeleniumTestCase.php
@@ -160,6 +160,8 @@ public function start()
array($this->browser, $this->browserUrl)
);
+ $this->doCommand('setTimeout', array($this->timeout));
+
if ($this->runId === NULL) {
$dbListener = PHPUnit_Util_Log_Database::getInstance();
@@ -338,16 +340,12 @@ public function __call($command, $arguments)
case 'setCursorPosition':
case 'setMouseSpeed':
case 'setSpeed':
- case 'setTimeout':
case 'shiftKeyDown':
case 'shiftKeyUp':
case 'submit':
case 'type':
case 'typeKeys':
case 'uncheck':
- case 'waitForCondition':
- case 'waitForPageToLoad':
- case 'waitForPopUp':
case 'windowFocus':
case 'windowMaximize': {
$this->doCommand($command, $arguments);
@@ -437,6 +435,27 @@ public function __call($command, $arguments)
$this->defaultAssertions($command);
}
break;
+
+ case 'waitForCondition':
+ case 'waitForPopUp': {
+ if (count($arguments) == 1) {
+ $arguments[] = $this->timeout;
+ }
+
+ $this->doCommand($command, $arguments);
+ $this->defaultAssertions($command);
+ }
+ break;
+
+ case 'waitForPageToLoad': {
+ if (empty($arguments)) {
+ $arguments[] = $this->timeout;
+ }
+
+ $this->doCommand($command, $arguments);
+ $this->defaultAssertions($command);
+ }
+ break;
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.