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

Backports for Prado 3.2.4

1 files changed, 30 insertions, 30 deletions

diff --git a/tests/FunctionalTests/validators/tests/ConditionalValidationTestCase.php b/tests/FunctionalTests/validators/tests/ConditionalValidationTestCase.php
index 02b174ef..32e79a90 100755
--- a/tests/FunctionalTests/validators/tests/ConditionalValidationTestCase.php
+++ b/tests/FunctionalTests/validators/tests/ConditionalValidationTestCase.php
@@ -1,52 +1,52 @@
 <?php
 
-class ConditionalValidationTestCase extends PradoGenericSeleniumTest
+class ConditionalValidationTestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base = "ctl0_Content_";
-		$this->open("validators/index.php?page=ConditionalValidation", "");
-		$this->verifyTextPresent("Conditional Validation (clientside + server side)", "");
-		$this->assertNotVisible("{$base}validator1", "");
-		$this->assertNotVisible("{$base}validator2", "");
+		$this->url("validators/index.php?page=ConditionalValidation");
+		$this->assertContains("Conditional Validation (clientside + server side)", $this->source());
+		$this->assertNotVisible("{$base}validator1");
+		$this->assertNotVisible("{$base}validator2");
 
-		$this->click("{$base}submit1");
-		$this->assertVisible("{$base}validator1", "");
-		$this->assertNotVisible("{$base}validator2", "");
+		$this->byId("{$base}submit1")->click();
+		$this->assertVisible("{$base}validator1");
+		$this->assertNotVisible("{$base}validator2");
 
-		$this->click("{$base}check1");
-		$this->click("{$base}submit1");
-		$this->assertVisible("{$base}validator1", "");
-		$this->assertVisible("{$base}validator2", "");
+		$this->byId("{$base}check1")->click();
+		$this->byId("{$base}submit1")->click();
+		$this->assertVisible("{$base}validator1");
+		$this->assertVisible("{$base}validator2");
 
-		$this->click("{$base}check1");
-		$this->click("{$base}submit1");
-		$this->assertVisible("{$base}validator1", "");
-		$this->assertNotVisible("{$base}validator2", "");
+		$this->byId("{$base}check1")->click();
+		$this->byId("{$base}submit1")->click();
+		$this->assertVisible("{$base}validator1");
+		$this->assertNotVisible("{$base}validator2");
 
 		$this->type("{$base}text1", "testing");
-		$this->clickAndWait("{$base}submit1");
-		$this->assertNotVisible("{$base}validator1", "");
-		$this->assertNotVisible("{$base}validator2", "");
+		$this->byId("{$base}submit1")->click();
+		$this->assertNotVisible("{$base}validator1");
+		$this->assertNotVisible("{$base}validator2");
 
 		$this->type("{$base}text1" ,"");
-		$this->click("{$base}check1");
-		$this->click("{$base}submit1");
-		$this->assertVisible("{$base}validator1", "");
-		$this->assertVisible("{$base}validator2", "");
+		$this->byId("{$base}check1")->click();
+		$this->byId("{$base}submit1")->click();
+		$this->assertVisible("{$base}validator1");
+		$this->assertVisible("{$base}validator2");
 
 		$this->type("{$base}text1", "test");
 		$this->type("{$base}text2", "123");
-		$this->clickAndWait("{$base}submit1");
-		$this->assertNotVisible("{$base}validator1", "");
-		$this->assertNotVisible("{$base}validator2", "");
+		$this->byId("{$base}submit1")->click();
+		$this->assertNotVisible("{$base}validator1");
+		$this->assertNotVisible("{$base}validator2");
 
-		$this->click("{$base}check1");
+		$this->byId("{$base}check1")->click();
 		$this->type("{$base}text1", "");
 		$this->type("{$base}text2", "");
-		$this->click("{$base}submit1");
-		$this->assertVisible("{$base}validator1", "");
-		$this->assertNotVisible("{$base}validator2", "");
+		$this->byId("{$base}submit1")->click();
+		$this->assertVisible("{$base}validator1");
+		$this->assertNotVisible("{$base}validator2");
 
 	}