summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorxue <>2006-08-31 20:17:39 +0000
committerxue <>2006-08-31 20:17:39 +0000
commit47a3cb88e7ed7f2a87bbf024dff3416fc6cd8002 (patch)
tree0eb41f1ab1f2351905cd95054a328c34361e5080 /tests
parentb680e71693696a7b5280787ccd084cf860bcf989 (diff)
merge from 3.0 branch till 1374.
Diffstat (limited to 'tests')
-rw-r--r--tests/FunctionalTests/quickstart/Controls/DataGrid3TestCase.php2
-rw-r--r--tests/FunctionalTests/tickets/protected/pages/Ticket351.page1
-rw-r--r--tests/FunctionalTests/tickets/tests/Ticket274TestCase.php4
3 files changed, 4 insertions, 3 deletions
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 @@
<com:TContent ID="Content">
<com:TDatePicker ID="Birthdate"
DateFormat="MMM/d/yyyy"
+ TimeStamp="-2000000000"
FromYear="1900" UpToYear="1990" InputMode="DropDownList" />
<br />
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');
}
}