Fixed some function tests; start working on porting them to Selenium2 interface

(cherry picked from commit 5d9f6fc77131d75e6c73a7e57df8d967b6b09215)

Conflicts:
	tests/FunctionalTests/validators/tests/DatePickerTestCase.php

2 files changed, 1 insertions, 3 deletions

diff --git a/tests/FunctionalTests/validators/tests/DatePickerTestCase.php b/tests/FunctionalTests/validators/tests/DatePickerTestCase.php
index e7425a33..a80ff254 100755
--- a/tests/FunctionalTests/validators/tests/DatePickerTestCase.php
+++ b/tests/FunctionalTests/validators/tests/DatePickerTestCase.php
@@ -27,8 +27,6 @@ class DatePickerTestCase extends PradoGenericSeleniumTest
 		$this->assertNotVisible("{$base}validator6", "");
 		$this->assertVisible("{$base}validator8", "");
 
-		$this->click("{$base}submit1");
-		$this->pause(250);
 		$this->type("{$base}picker1", "13/4/$year");
 		$this->select("{$base}picker2_month", "label=9");
 		$this->select("{$base}picker2_day", "label=10");
diff --git a/tests/FunctionalTests/validators/tests/RequiredFieldTestCase.php b/tests/FunctionalTests/validators/tests/RequiredFieldTestCase.php
index f8b54eb0..8ee278f8 100755
--- a/tests/FunctionalTests/validators/tests/RequiredFieldTestCase.php
+++ b/tests/FunctionalTests/validators/tests/RequiredFieldTestCase.php
@@ -48,7 +48,7 @@ class RequiredFieldTestCase extends PradoGenericSeleniumTest
 
 		$this->type("{$base}text1", "Hello");
 		$this->click("{$base}check1");
-		$this->click("{$base}submit2");
+		$this->clickAndWait("{$base}submit2");
 
 		$this->assertNotVisible("{$base}validator5");
 		$this->assertNotVisible("{$base}validator6");