From 94e54d3023ed89281f89125f3ad0553afb9312cb Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Wed, 5 Mar 2014 23:02:18 +0100 Subject: Started cleaning tests' selenium2 compatibility layer (cherry picked from commit 4ce02f6973aa40c313364b5ff7990f2244309790) Conflicts: tests/FunctionalTests/tickets/tests/Ticket220TestCase.php tests/FunctionalTests/tickets/tests/Ticket719TestCase.php tests/FunctionalTests/tickets/tests/Ticket769TestCase.php tests/FunctionalTests/validators/tests/CompareValidatorTestCase.php tests/FunctionalTests/validators/tests/DataTypeValidatorTestCase.php tests/FunctionalTests/validators/tests/DatePickerTestCase.php --- .../FunctionalTests/quickstart/Controls/Repeater3TestCase.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/FunctionalTests/quickstart/Controls/Repeater3TestCase.php') diff --git a/tests/FunctionalTests/quickstart/Controls/Repeater3TestCase.php b/tests/FunctionalTests/quickstart/Controls/Repeater3TestCase.php index 22a5ab71..3572a36f 100755 --- a/tests/FunctionalTests/quickstart/Controls/Repeater3TestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/Repeater3TestCase.php @@ -9,21 +9,21 @@ class QuickstartRepeater3TestCase extends PradoGenericSelenium2Test // verify product name is required $this->assertNotVisible('ctl0_body_Repeater_ctl0_ctl0'); $this->type("ctl0_body_Repeater_ctl0_ProductName", ""); - $this->click("//input[@type='submit' and @value='Save']", ""); + $this->byXPath("//input[@type='submit' and @value='Save']")->click(); $this->assertVisible('ctl0_body_Repeater_ctl0_ctl0'); // verify product price is of proper format $this->assertNotVisible('ctl0_body_Repeater_ctl0_ctl1'); $this->type("ctl0_body_Repeater_ctl0_ProductPrice", "abc"); - $this->click("//input[@type='submit' and @value='Save']", ""); + $this->byXPath("//input[@type='submit' and @value='Save']")->click(); $this->assertVisible('ctl0_body_Repeater_ctl0_ctl1'); // perform postback - $this->click("ctl0_body_Repeater_ctl0_ProductImported",''); + $this->byId("ctl0_body_Repeater_ctl0_ProductImported",'')->click(); $this->type("ctl0_body_Repeater_ctl0_ProductName", "Mother Board"); $this->type("ctl0_body_Repeater_ctl0_ProductPrice", "99.01"); - $this->select("ctl0_body_Repeater_ctl3_ProductCategory", "label=Accessories"); - $this->clickAndWait("//input[@type='submit' and @value='Save']", ""); + $this->select("ctl0_body_Repeater_ctl3_ProductCategory", "Accessories"); + $this->byXPath("//input[@type='submit' and @value='Save']")->click(); $this->assertNotVisible('ctl0_body_Repeater_ctl0_ctl0'); $this->assertNotVisible('ctl0_body_Repeater_ctl0_ctl1'); -- cgit v1.2.3