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

Backports for Prado 3.2.4

1 files changed, 14 insertions, 14 deletions

diff --git a/tests/FunctionalTests/quickstart/Controls/LinkButtonTestCase.php b/tests/FunctionalTests/quickstart/Controls/LinkButtonTestCase.php
index 57e7b975..97b4863d 100755
--- a/tests/FunctionalTests/quickstart/Controls/LinkButtonTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/LinkButtonTestCase.php
@@ -1,32 +1,32 @@
 <?php
 
-class QuickstartLinkButtonTestCase extends PradoGenericSeleniumTest
+class QuickstartLinkButtonTestCase extends PradoGenericSelenium2Test
 {
 	function test ()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TLinkButton.Home&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TLinkButton.Home&amp;notheme=true&amp;lang=en");
 
-		$this->verifyTitle("PRADO QuickStart Sample", "");
+		$this->assertEquals("PRADO QuickStart Sample", $this->title());
 
 		// regular buttons
-		$this->clickAndWait("link=link button", "");
-		$this->clickAndWait("//a[contains(text(),'body content')]", "");
+		$this->byLinkText("link button")->click();
+		$this->byXPath("//a[contains(text(),'body content')]")->click();
 
 		// a click button
-		$this->clickAndWait("link=click me", "");
-		$this->clickAndWait("link=I'm clicked", "");
+		$this->byLinkText("click me")->click();
+		$this->byLinkText("I'm clicked")->click();
 
 		// a command button
-		$this->clickAndWait("link=click me", "");
-		$this->clickAndWait("//a[contains(text(),'Name: test, Param: value')]", "");
+		$this->byLinkText("click me")->click();
+		$this->byXPath("//a[contains(text(),'Name: test, Param: value')]")->click();
 
 		// a button causing validation
-		$this->verifyNotVisible('ctl0_body_ctl4');
-		$this->click("link=submit", "");
+		$this->assertNotVisible('ctl0_body_ctl4');
+		$this->byLinkText("submit")->click();
 //		$this->pause(1000);
-		$this->verifyVisible('ctl0_body_ctl4');
+		$this->assertVisible('ctl0_body_ctl4');
 		$this->type("ctl0\$body\$TextBox", "test");
-		$this->clickAndWait("link=submit", "");
-		$this->verifyNotVisible('ctl0_body_ctl4');
+		$this->byLinkText("submit")->click();
+		$this->assertNotVisible('ctl0_body_ctl4');
 	}
 }