Merge [956].

sebastianbergmann · Aug 6, 2007 · 1176c99 · 1176c99
1 parent d8d64cd
commit 1176c99
Showing 1 changed file with 23 additions and 4 deletions.
diff --git a/PHPUnit/Extensions/SeleniumTestCase.php b/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;
         }
     }