Started cleaning tests' selenium2 compatibility layer

1 files changed, 11 insertions, 11 deletions

diff --git a/tests/FunctionalTests/quickstart/Controls/Wizard5TestCase.php b/tests/FunctionalTests/quickstart/Controls/Wizard5TestCase.php
index 8fbd59c5..4c41a074 100755
--- a/tests/FunctionalTests/quickstart/Controls/Wizard5TestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/Wizard5TestCase.php
@@ -6,30 +6,30 @@ class QuickstartWizard5TestCase extends PradoGenericSelenium2Test
 	{
 		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TWizard.Sample5&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->assertContains('Please let us know your preference', $this->source());
 		$this->assertVisible('ctl0_body_Wizard1_SideBarList_ctl0_SideBarButton');
 		$this->assertVisible('ctl0_body_Wizard1_SideBarList_ctl1_SideBarButton');
-		$this->verifyAttribute('ctl0_body_Wizard1_SideBarList_ctl2_SideBarButton@disabled','regexp:true|disabled');
-		$this->select('ctl0_body_Wizard1_DropDownList1', "label=Cyan");
-		$this->clickAndWait('ctl0$body$Wizard1$ctl4$ctl0');
+		$this->assertAttribute('ctl0_body_Wizard1_SideBarList_ctl2_SideBarButton@disabled','regexp:true|disabled');
+		$this->select('ctl0_body_Wizard1_DropDownList1', "Cyan");
+		$this->byName('ctl0$body$Wizard1$ctl4$ctl0')->click();
 
 		// step 2
-		$this->select('ctl0_body_Wizard1_Step2_DropDownList2','label=Football');
-		$this->clickAndWait('ctl0$body$Wizard1$ctl6$ctl0');
+		$this->select('ctl0_body_Wizard1_Step2_DropDownList2','Football');
+		$this->byName('ctl0$body$Wizard1$ctl6$ctl0')->click();
 
 		// step 1
 		$this->assertSelected('ctl0_body_Wizard1_DropDownList1','Cyan');
-		$this->clickAndWait('ctl0_body_Wizard1_SideBarList_ctl1_SideBarButton');
+		$this->byId('ctl0_body_Wizard1_SideBarList_ctl1_SideBarButton')->click();
 
 		// step 2
 		$this->assertSelected('ctl0_body_Wizard1_Step2_DropDownList2','Football');
-		$this->clickAndWait('ctl0$body$Wizard1$ctl6$ctl1');
+		$this->byName('ctl0$body$Wizard1$ctl6$ctl1')->click();
 
 		// step 3
-		$this->assertTextPresent('Your favorite color is: Cyan');
-		$this->assertTextPresent('Your favorite sport is: Football');
+		$this->assertContains('Your favorite color is: Cyan', $this->source());
+		$this->assertContains('Your favorite sport is: Football', $this->source());
 	}
 }