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

Backports for Prado 3.2.4

1 files changed, 18 insertions, 18 deletions

diff --git a/tests/FunctionalTests/quickstart/Controls/DataGrid1TestCase.php b/tests/FunctionalTests/quickstart/Controls/DataGrid1TestCase.php
index 57ee92ae..4f4ca60a 100755
--- a/tests/FunctionalTests/quickstart/Controls/DataGrid1TestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/DataGrid1TestCase.php
@@ -1,29 +1,29 @@
 <?php
 
-class QuickstartDataGrid1TestCase extends PradoGenericSeleniumTest
+class QuickstartDataGrid1TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TDataGrid.Sample1&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TDataGrid.Sample1&amp;notheme=true&amp;lang=en");
 
 		// verify if all required texts are present
-		$this->verifyTextPresent('id','');
-		$this->verifyTextPresent('name','');
-		$this->verifyTextPresent('quantity','');
-		$this->verifyTextPresent('price','');
-		$this->verifyTextPresent('imported','');
-		$this->verifyTextPresent('ITN001','');
-		$this->verifyTextPresent('Motherboard','');
-		$this->verifyTextPresent('100','');
-		$this->verifyTextPresent('true','');
-		$this->verifyTextPresent('ITN019','');
-		$this->verifyTextPresent('Speaker','');
-		$this->verifyTextPresent('35','');
-		$this->verifyTextPresent('65','');
-		$this->verifyTextPresent('false','');
+		$this->assertContains('id', $this->source());
+		$this->assertContains('name', $this->source());
+		$this->assertContains('quantity', $this->source());
+		$this->assertContains('price', $this->source());
+		$this->assertContains('imported', $this->source());
+		$this->assertContains('ITN001', $this->source());
+		$this->assertContains('Motherboard', $this->source());
+		$this->assertContains('100', $this->source());
+		$this->assertContains('true', $this->source());
+		$this->assertContains('ITN019', $this->source());
+		$this->assertContains('Speaker', $this->source());
+		$this->assertContains('35', $this->source());
+		$this->assertContains('65', $this->source());
+		$this->assertContains('false', $this->source());
 
 		// verify specific table tags
-		$this->verifyElementPresent("ctl0_body_DataGrid");
-		$this->verifyAttribute("ctl0_body_DataGrid@cellpadding","2");
+		$this->assertElementPresent("ctl0_body_DataGrid");
+		$this->assertAttribute("ctl0_body_DataGrid@cellpadding","2");
 	}
 }