From 47a3cb88e7ed7f2a87bbf024dff3416fc6cd8002 Mon Sep 17 00:00:00 2001 From: xue <> Date: Thu, 31 Aug 2006 20:17:39 +0000 Subject: merge from 3.0 branch till 1374. --- tests/FunctionalTests/quickstart/Controls/DataGrid3TestCase.php | 2 +- tests/FunctionalTests/tickets/protected/pages/Ticket351.page | 1 + tests/FunctionalTests/tickets/tests/Ticket274TestCase.php | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/FunctionalTests/quickstart/Controls/DataGrid3TestCase.php b/tests/FunctionalTests/quickstart/Controls/DataGrid3TestCase.php index 39a5aba6..f44432dd 100644 --- a/tests/FunctionalTests/quickstart/Controls/DataGrid3TestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/DataGrid3TestCase.php @@ -20,7 +20,7 @@ class DataGrid3TestCase extends SeleniumTestCase $this->type("ctl0\$body\$DataGrid\$ctl2\$ctl2", "Addison Wesley Professional"); $this->type("ctl0\$body\$DataGrid\$ctl2\$ctl3", "\$57.04"); $this->click("//input[@name='ctl0\$body\$DataGrid\$ctl2\$ctl4']", ""); - $this->select("ctl0\$body\$DataGrid\$ctl2\$Rating", "label=1"); + $this->select("ctl0\$body\$DataGrid\$ctl2\$ctl5", "label=1"); $this->clickAndWait("link=Save", ""); // verify the 2nd row is saved diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket351.page b/tests/FunctionalTests/tickets/protected/pages/Ticket351.page index 5fb65f20..78a7488d 100644 --- a/tests/FunctionalTests/tickets/protected/pages/Ticket351.page +++ b/tests/FunctionalTests/tickets/protected/pages/Ticket351.page @@ -1,6 +1,7 @@
diff --git a/tests/FunctionalTests/tickets/tests/Ticket274TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket274TestCase.php index 6a5ae0ff..8b74e565 100644 --- a/tests/FunctionalTests/tickets/tests/Ticket274TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket274TestCase.php @@ -16,8 +16,8 @@ class Ticket274TestCase extends SeleniumTestCase $this->type($base.'MyDate', 'asd'); $this->clickAndWait($base.'button1'); - $this->assertVisible($base.'validator1'); - $this->assertNotVisible($base.'validator2'); + $this->assertNotVisible($base.'validator1'); + $this->assertVisible($base.'validator2'); } } -- cgit v1.2.3