From 32dfd8233520261483bdf30f23425e3b50f05d17 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Fri, 28 Feb 2014 10:39:25 +0100 Subject: Ported all tests from Selenium1 (RC) to Selenium2 (WebDriver) using a compatibility layer (cherry picked from commit 82774aa0a41562a325f31c901584ec01c8238573) Conflicts: tests/FunctionalTests/active-controls/tests/AutoCompleteTestCase.php tests/FunctionalTests/active-controls/tests/CustomTemplateTestCase.php tests/FunctionalTests/tickets/tests/Ticket220TestCase.php tests/FunctionalTests/tickets/tests/Ticket719TestCase.php tests/FunctionalTests/tickets/tests/Ticket769TestCase.php tests/FunctionalTests/validators/tests/DataTypeValidatorTestCase.php --- .../quickstart/Controls/DataList2TestCase.php | 41 +++++++++++----------- 1 file changed, 20 insertions(+), 21 deletions(-) (limited to 'tests/FunctionalTests/quickstart/Controls/DataList2TestCase.php') diff --git a/tests/FunctionalTests/quickstart/Controls/DataList2TestCase.php b/tests/FunctionalTests/quickstart/Controls/DataList2TestCase.php index 4fb3743e..2957c96f 100755 --- a/tests/FunctionalTests/quickstart/Controls/DataList2TestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/DataList2TestCase.php @@ -1,22 +1,22 @@ open("../../demos/quickstart/index.php?page=Controls.Samples.TDataList.Sample2&notheme=true&lang=en", ""); + $this->url("../../demos/quickstart/index.php?page=Controls.Samples.TDataList.Sample2&notheme=true&lang=en"); // verify initial presentation - $this->verifyTextPresent("Motherboard ", ""); - $this->verifyTextPresent("Monitor ", ""); + $this->assertTextPresent("Motherboard", ""); + $this->assertTextPresent("Monitor", ""); // verify selecting an item $this->clickAndWait("link=ITN003", ""); - $this->verifyTextPresent("Quantity", ""); - $this->verifyTextPresent("Price", ""); - $this->verifyTextPresent("\$80", ""); + $this->assertTextPresent("Quantity", ""); + $this->assertTextPresent("Price", ""); + $this->assertTextPresent("\$80", ""); $this->clickAndWait("link=ITN005", ""); - $this->verifyTextPresent("\$150", ""); + $this->assertTextPresent("\$150", ""); // verify editting an item $this->clickAndWait("id=ctl0_body_DataList_ctl5_ctl0", ""); @@ -27,8 +27,8 @@ class QuickstartDataList2TestCase extends PradoGenericSeleniumTest // verify item is saved $this->clickAndWait("link=ITN005", ""); - $this->verifyTextPresent("\$140.99", ""); - $this->verifyTextPresent("11", ""); + $this->assertTextPresent("\$140.99", ""); + $this->assertTextPresent("11", ""); // verify editting another item $this->clickAndWait("id=ctl0_body_DataList_ctl3_ctl1", ""); @@ -39,21 +39,20 @@ class QuickstartDataList2TestCase extends PradoGenericSeleniumTest // verify item is canceled $this->clickAndWait("link=ITN003", ""); - $this->verifyTextPresent("2", ""); - $this->verifyTextPresent("Harddrive ", ""); + $this->assertTextPresent("2", ""); + $this->assertTextPresent("Harddrive", ""); // verify item deletion $this->clickAndWait("id=ctl0_body_DataList_ctl3_ctl1", ""); $this->verifyConfirmation("Are you sure?"); - $this->chooseCancelOnNextConfirmation(); $this->click("id=ctl0_body_DataList_ctl5_ctl2", ""); - $this->verifyConfirmation("Are you sure?"); - $this->verifyTextPresent("Motherboard ", ""); - $this->verifyTextPresent("CPU ", ""); - $this->verifyTextNotPresent("Harddrive",""); - $this->verifyTextPresent("Sound card", ""); - $this->verifyTextPresent("Video card", ""); - $this->verifyTextPresent("Keyboard",""); - $this->verifyTextPresent("Monitor ", ""); + $this->verifyConfirmationDismiss("Are you sure?"); + $this->assertTextPresent("Motherboard", ""); + $this->assertTextPresent("CPU", ""); + $this->assertTextNotPresent("Harddrive",""); + $this->assertTextPresent("Sound card", ""); + $this->assertTextPresent("Video card", ""); + $this->assertTextPresent("Keyboard",""); + $this->assertTextPresent("Monitor", ""); } } -- cgit v1.2.3