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

Backports for Prado 3.2.4

1 files changed, 9 insertions, 9 deletions

diff --git a/tests/FunctionalTests/quickstart/Controls/LabelTestCase.php b/tests/FunctionalTests/quickstart/Controls/LabelTestCase.php
index 03bba8ed..a9aa0bbe 100755
--- a/tests/FunctionalTests/quickstart/Controls/LabelTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/LabelTestCase.php
@@ -1,20 +1,20 @@
 <?php
 
 //New Test
-class QuickstartLabelTestCase extends PradoGenericSeleniumTest
+class QuickstartLabelTestCase extends PradoGenericSelenium2Test
 {
 	function test ()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TLabel.Home&amp;notheme=true&amp;lang=en", "");
-		$this->verifyTitle("PRADO QuickStart Sample", "");
-		$this->verifyTextPresent("This is a label with customized color and font.", "");
-		$this->verifyTextPresent("This is a form label associated with the TTextBox control below", "");
-		$this->verifyTextPresent("This is a label with empty Text property and nonempty body", "");
-		$this->verifyTextPresent("This is a disabled label", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TLabel.Home&amp;notheme=true&amp;lang=en");
+		$this->assertEquals("PRADO QuickStart Sample", $this->title());
+		$this->assertContains("This is a label with customized color and font.", $this->source());
+		$this->assertContains("This is a form label associated with the TTextBox control below", $this->source());
+		$this->assertContains("This is a label with empty Text property and <b>nonempty body</b>", $this->source());
+		$this->assertContains("This is a disabled label", $this->source());
 
-		$this->verifyAttribute("ctl0_body_Label2@disabled","regexp:true|disabled");
+		$this->assertAttribute("ctl0_body_Label2@disabled","regexp:true|disabled");
 
-		//$this->verifyAttribute("ctl0_body_Label1@for","ctl0_body_test");
+		//$this->assertAttribute("ctl0_body_Label1@for","ctl0_body_test");
 
 		$this->type("ctl0\$body\$test", "test");
 	}