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/TableTestCase.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'tests/FunctionalTests/quickstart/Controls/TableTestCase.php') diff --git a/tests/FunctionalTests/quickstart/Controls/TableTestCase.php b/tests/FunctionalTests/quickstart/Controls/TableTestCase.php index 128f4b22..aafd6f80 100755 --- a/tests/FunctionalTests/quickstart/Controls/TableTestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/TableTestCase.php @@ -1,18 +1,18 @@ open("../../demos/quickstart/index.php?page=Controls.Samples.TTable.Home&notheme=true&lang=en", ""); + $this->url("../../demos/quickstart/index.php?page=Controls.Samples.TTable.Home&notheme=true&lang=en"); - $this->verifyElementPresent("//table[@rules='all' and @border='1']"); - $this->verifyElementPresent("//table/caption[@align='bottom' and text()='This is table caption']"); - $this->verifyElementPresent("//th[text()='header cell 2']"); - $this->verifyElementPresent("//tr[@align='right']/td[text()='text']"); - $this->verifyElementPresent("//td[@align='center' and contains(text(),'cell 5')]"); + $this->assertElementPresent("//table[@rules='all' and @border='1']"); + $this->assertElementPresent("//table/caption[@align='bottom' and text()='This is table caption']"); + $this->assertElementPresent("//th[text()='header cell 2']"); + $this->assertElementPresent("//tr[@align='right']/td[text()='text']"); + $this->assertElementPresent("//td[@align='center' and contains(text(),'cell 5')]"); - $this->verifyElementPresent("//th[text()='Header 1']"); - $this->verifyElementPresent("//td[text()='Cell 1']"); + $this->assertElementPresent("//th[text()='Header 1']"); + $this->assertElementPresent("//td[text()='Cell 1']"); } } -- cgit v1.2.3