Merge pull request #530 from pradosoft/prado-3.2.43.2.4prado-3.2

Backports for Prado 3.2.4

1 files changed, 6 insertions, 6 deletions

diff --git a/tests/FunctionalTests/validators/tests/CustomValidatorTestCase.php b/tests/FunctionalTests/validators/tests/CustomValidatorTestCase.php
index 106f7a00..ca48a453 100755
--- a/tests/FunctionalTests/validators/tests/CustomValidatorTestCase.php
+++ b/tests/FunctionalTests/validators/tests/CustomValidatorTestCase.php
@@ -1,18 +1,18 @@
 <?php
 
 //New Test
-class CustomValidatorTestCase extends PradoGenericSeleniumTest
+class CustomValidatorTestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base = "ctl0_Content_";
-		$this->open("validators/index.php?page=CustomValidator", "");
-		$this->assertTextPresent("Prado CustomValidator Tests", "");
+		$this->url("validators/index.php?page=CustomValidator");
+		$this->assertContains("Prado CustomValidator Tests", $this->source());
 		$this->assertNotVisible("{$base}validator1");
 
-		$this->click("//input[@type='submit' and @value='Test']", "");
+		$this->byXPath("//input[@type='submit' and @value='Test']")->click();
 		$this->assertVisible("{$base}validator1");
-		
+
 		$this->type("{$base}text1", "Prado");
 		$this->pause(250);
 		$this->assertNotVisible("{$base}validator1");
@@ -22,7 +22,7 @@ class CustomValidatorTestCase extends PradoGenericSeleniumTest
 		$this->type("{$base}text1", "Prado");
 		$this->pause(250);
 		$this->assertNotVisible("{$base}validator1");
-		$this->clickAndWait("//input[@type='submit' and @value='Test']", "");
+		$this->byXPath("//input[@type='submit' and @value='Test']")->click();
 		$this->assertNotVisible("{$base}validator1");
 
 	}