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

Backports for Prado 3.2.4

1 files changed, 15 insertions, 15 deletions

diff --git a/tests/FunctionalTests/tickets/tests/Ticket535TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket535TestCase.php
index 26f5a7d7..eebd2336 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket535TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket535TestCase.php
@@ -1,34 +1,34 @@
 <?php
 
-class Ticket535TestCase extends PradoGenericSeleniumTest
+class Ticket535TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base = 'ctl0_Content_';
-		$this->open('tickets/index.php?page=Ticket535');
-		$this->assertTitle("Verifying Ticket 535");
+		$this->url('tickets/index.php?page=Ticket535');
+		$this->assertEquals($this->title(), "Verifying Ticket 535");
 
 		$this->assertText("{$base}label1", "Label 1");
 
-		$this->click("{$base}radio1");
-		$this->click("{$base}button1");
+		$this->byId("{$base}radio1")->click();
+		$this->byId("{$base}button1")->click();
 		$this->pause(800);
-		$this->assertText("{$base}label1", 'exact:radio1 checked:{1} radio2 checked:{}');
+		$this->assertText("{$base}label1", 'radio1 checked:{1} radio2 checked:{}');
 
-		$this->click("{$base}radio2");
-		$this->click("{$base}button1");
+		$this->byId("{$base}radio2")->click();
+		$this->byId("{$base}button1")->click();
 		$this->pause(800);
-		$this->assertText("{$base}label1", 'exact:radio1 checked:{1} radio2 checked:{1}');
+		$this->assertText("{$base}label1", 'radio1 checked:{1} radio2 checked:{1}');
 
-		$this->click("{$base}bad_radio1");
-		$this->click("{$base}button2");
+		$this->byId("{$base}bad_radio1")->click();
+		$this->byId("{$base}button2")->click();
 		$this->pause(800);
-		$this->assertText("{$base}label1", 'exact:bad_radio1 checked:{1} bad_radio2 checked:{}');
+		$this->assertText("{$base}label1", 'bad_radio1 checked:{1} bad_radio2 checked:{}');
 
-		$this->click("{$base}bad_radio2");
-		$this->click("{$base}button2");
+		$this->byId("{$base}bad_radio2")->click();
+		$this->byId("{$base}button2")->click();
 		$this->pause(800);
-		$this->assertText("{$base}label1", 'exact:bad_radio1 checked:{} bad_radio2 checked:{1}');
+		$this->assertText("{$base}label1", 'bad_radio1 checked:{} bad_radio2 checked:{1}');
 	}
 
 }