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

Backports for Prado 3.2.4

1 files changed, 10 insertions, 10 deletions

diff --git a/tests/FunctionalTests/tickets/tests/Ticket278TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket278TestCase.php
index 4bfffede..ca11f626 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket278TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket278TestCase.php
@@ -1,28 +1,28 @@
 <?php
 
-class Ticket278TestCase extends PradoGenericSeleniumTest
+class Ticket278TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base = 'ctl0_Content_';
-		$this->open('tickets/index.php?page=Ticket278');
-		$this->assertTitle('Verifying Ticket 278');
+		$this->url('tickets/index.php?page=Ticket278');
+		$this->assertEquals($this->title(), 'Verifying Ticket 278');
 		$this->assertNotVisible($base.'validator1');
 		$this->assertNotVisible($base.'validator2');
 		$this->assertNotVisible($base.'panel1');
 
-		$this->click($base.'button1');
+		$this->byId($base.'button1')->click();
 		$this->assertVisible($base.'validator1');
 		$this->assertNotVisible($base.'validator2');
 
 		$this->type($base.'text1', 'asd');
-		$this->clickAndWait($base.'button1');
+		$this->byId($base.'button1')->click();
 		$this->assertNotVisible($base.'validator1');
 		$this->assertNotVisible($base.'validator2');
 		$this->assertNotVisible($base.'panel1');
 
-		$this->click($base.'check1');
-		$this->click($base.'button1');
+		$this->byId($base.'check1')->click();
+		$this->byId($base.'button1')->click();
 		$this->assertNotVisible($base.'validator1');
 		$this->assertVisible($base.'validator2');
 		$this->assertVisible($base.'panel1');
@@ -30,21 +30,21 @@ class Ticket278TestCase extends PradoGenericSeleniumTest
 
 		$this->type($base.'text1', '');
 		$this->type($base.'text2', 'asd');
-		$this->click($base.'button1');
+		$this->byId($base.'button1')->click();
 		$this->assertVisible($base.'validator1');
 		$this->assertNotVisible($base.'validator2');
 		$this->assertVisible($base.'panel1');
 
 
 		$this->type($base.'text1', 'asd');
-		$this->clickAndWait($base.'button1');
+		$this->byId($base.'button1')->click();
 		$this->assertNotVisible($base.'validator1');
 		$this->assertNotVisible($base.'validator2');
 		$this->assertVisible($base.'panel1');
 
 		$this->type($base.'text1', '');
 		$this->type($base.'text2', '');
-		$this->click($base.'button1');
+		$this->byId($base.'button1')->click();
 		$this->assertVisible($base.'validator1');
 		$this->assertVisible($base.'validator2');
 		$this->assertVisible($base.'panel1');