Started cleaning tests' selenium2 compatibility layer

1 files changed, 9 insertions, 9 deletions

diff --git a/tests/FunctionalTests/quickstart/Controls/Wizard2TestCase.php b/tests/FunctionalTests/quickstart/Controls/Wizard2TestCase.php
index 23881968..85ef8655 100755
--- a/tests/FunctionalTests/quickstart/Controls/Wizard2TestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/Wizard2TestCase.php
@@ -6,19 +6,19 @@ class QuickstartWizard2TestCase extends PradoGenericSelenium2Test
 	{
 		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TWizard.Sample2&notheme=true&lang=en");
 
-		$this->verifyTitle("PRADO QuickStart Sample", "");
+		$this->assertEquals("PRADO QuickStart Sample", $this->title());
 
 		// step 1
-		$this->assertTextPresent('Please let us know your preference');
-		$this->assertTextNotPresent('Thank you for your answer');
+		$this->assertContains('Please let us know your preference', $this->source());
+		$this->assertNotContains('Thank you for your answer', $this->source());
 		$this->assertVisible('ctl0_body_Wizard1_SideBarList_ctl0_SideBarButton');
-		$this->verifyAttribute('ctl0_body_Wizard1_SideBarList_ctl1_SideBarButton@disabled','regexp:true|disabled');
-		$this->select('ctl0$body$Wizard1$DropDownList1', "label=Blue");
-		$this->clickAndWait('ctl0$body$Wizard1$ctl6$ctl1');
+		$this->assertAttribute('ctl0_body_Wizard1_SideBarList_ctl1_SideBarButton@disabled','regexp:true|disabled');
+		$this->select('ctl0$body$Wizard1$DropDownList1', "Blue");
+		$this->byName('ctl0$body$Wizard1$ctl6$ctl1')->click();
 
 		// step 2
-		$this->assertTextPresent('Your favorite color is: Blue');
-		$this->assertTextNotPresent('Please let us know your preference');
-		$this->assertTextPresent('Thank you for your answer');
+		$this->assertContains('Your favorite color is: Blue', $this->source());
+		$this->assertNotContains('Please let us know your preference', $this->source());
+		$this->assertContains('Thank you for your answer', $this->source());
 	}
 }