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, 11 deletions

diff --git a/tests/FunctionalTests/tickets/tests/Ticket290TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket290TestCase.php
index f541d63d..8116e753 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket290TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket290TestCase.php
@@ -1,28 +1,27 @@
 <?php
 
 /**
-* 
+*
 */
-class Ticket290TestCase extends PradoGenericSeleniumTest
+class Ticket290TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base = 'ctl0_Content_';
-		$this->open('tickets/index.php?page=Ticket290');
-		$this->assertTitle("Verifying Ticket 290");
-		
+		$this->url('tickets/index.php?page=Ticket290');
+		$this->assertEquals($this->title(), "Verifying Ticket 290");
+
 		$this->assertText("{$base}label1", "Label 1");
 		$this->assertText("{$base}label2", "Label 2");
 
 		$this->type("{$base}textbox1", "test");
-		// bad hack to simulate enter key.. 
-		$this->submit('ctl0_ctl1');
+
+		$this->byId("{$base}textbox1")->click();
+		$this->keys(PHPUnit_Extensions_Selenium2TestCase_Keys::ENTER);
 		$this->pause(800);
-		
-		$this->assertText("{$base}label1", "Doing Validation");
 
-		// this can't work properly without manual testing
-		//$this->assertText("{$base}label2", "Button 2 (default) Clicked!");
+		$this->assertText("{$base}label1", "Doing Validation");
+		$this->assertText("{$base}label2", "Button 2 (default) Clicked!");
 	}
 }