From c1937cccd0985e86e247287faa9ac60870feecd7 Mon Sep 17 00:00:00 2001 From: xue <> Date: Sun, 27 Aug 2006 23:26:55 +0000 Subject: Merge from 3.0 branch till 1350. --- .../features/protected/pages/ValidatorEffects.page | 44 +++++++++++----------- .../quickstart/Controls/DataGrid3TestCase.php | 24 ++++++------ .../tickets/protected/pages/Ticket278.page | 18 ++++----- .../tickets/tests/Ticket274TestCase.php | 10 ++--- 4 files changed, 48 insertions(+), 48 deletions(-) (limited to 'tests/FunctionalTests') diff --git a/tests/FunctionalTests/features/protected/pages/ValidatorEffects.page b/tests/FunctionalTests/features/protected/pages/ValidatorEffects.page index 7fca0f56..e01b542e 100644 --- a/tests/FunctionalTests/features/protected/pages/ValidatorEffects.page +++ b/tests/FunctionalTests/features/protected/pages/ValidatorEffects.page @@ -4,43 +4,43 @@
Create New Account - +
- Username: + Username: - Effect.Shake(validator.control); - Effect.Appear(validator.message); + Effect.Shake(sender.control); + Effect.Appear(sender.message); - Effect.Fade(validator.message); + Effect.Fade(sender.message); - +
Password - -
+ ClientSide.OnError="sender.message.visualEffect('appear')" + ClientSide.OnSuccess="sender.message.visualEffect('fade')" + ErrorMessage="a password is required." /> +
@@ -54,7 +54,7 @@
Login Name: - +
- - Effect.Appear(summary.messages) - Effect.Shake(summary.messages,{ queue: 'end'}) - + Effect.Appear(sender.messages) + Effect.Shake(sender.messages,{ queue: 'end'}) +
- - if(!confirm('<%= Prado::localize("Confirm Delete") %>')) + if(!confirm('<%= Prado::localize("Confirm Delete") %>')) return false; diff --git a/tests/FunctionalTests/quickstart/Controls/DataGrid3TestCase.php b/tests/FunctionalTests/quickstart/Controls/DataGrid3TestCase.php index 4f53a38e..39a5aba6 100644 --- a/tests/FunctionalTests/quickstart/Controls/DataGrid3TestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/DataGrid3TestCase.php @@ -10,16 +10,16 @@ class DataGrid3TestCase extends SeleniumTestCase $this->verifyTextPresent("Design Patterns: Elements of Reusable Object-Oriented Software", ""); $this->verifyTextPresent("Addison-Wesley Professional", ""); $this->verifyTextPresent("$47.04", ""); - $this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl7@checked','regexp:true|checked'); - $this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl7@disabled','regexp:true|disabled'); + $this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl1@checked','regexp:true|checked'); + $this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl1@disabled','regexp:true|disabled'); //$this->verifyElementPresent("//img[@src='images/star5.gif']",''); // edit the 2nd row - $this->clickAndWait("id=ctl0_body_DataGrid_ctl2_ctl8", ""); - $this->type("ctl0\$body\$DataGrid\$ctl2\$ctl7", "Design Pattern: Elements of Reusable Object-Oriented Software"); - $this->type("ctl0\$body\$DataGrid\$ctl2\$ctl8", "Addison Wesley Professional"); - $this->type("ctl0\$body\$DataGrid\$ctl2\$ctl9", "\$57.04"); - $this->click("//input[@name='ctl0\$body\$DataGrid\$ctl2\$ctl10']", ""); + $this->clickAndWait("id=ctl0_body_DataGrid_ctl2_ctl2", ""); + $this->type("ctl0\$body\$DataGrid\$ctl2\$ctl1", "Design Pattern: Elements of Reusable Object-Oriented Software"); + $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->clickAndWait("link=Save", ""); @@ -27,23 +27,23 @@ class DataGrid3TestCase extends SeleniumTestCase $this->verifyTextPresent("Design Pattern: Elements of Reusable Object-Oriented Software", ""); $this->verifyTextPresent("Addison Wesley Professional", ""); $this->verifyTextPresent("$57.04", ""); - $this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl7@checked','regexp:false|null'); - $this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl7@disabled','regexp:true|disabled'); + $this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl1@checked','regexp:false|null'); + $this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl1@disabled','regexp:true|disabled'); //$this->verifyElementPresent("//img[@src='images/star1.gif']",''); // verify cancel editting the 3rd row - $this->clickAndWait("id=ctl0_body_DataGrid_ctl3_ctl8", ""); + $this->clickAndWait("id=ctl0_body_DataGrid_ctl3_ctl2", ""); $this->clickAndWait("link=Cancel", ""); $this->verifyTextPresent("Design Patterns Explained : A New Perspective on Object-Oriented Design", ""); // verify deleting - $this->clickAndWait("id=ctl0_body_DataGrid_ctl3_ctl9", ""); + $this->clickAndWait("id=ctl0_body_DataGrid_ctl3_ctl3", ""); $this->verifyConfirmation("Are you sure?"); $this->verifyTextNotPresent("Design Patterns Explained : A New Perspective on Object-Oriented Design", ""); $this->verifyTextPresent("Extreme Programming Explained : Embrace Change",''); $this->chooseCancelOnNextConfirmation(); - $this->click("id=ctl0_body_DataGrid_ctl6_ctl9", ""); + $this->click("id=ctl0_body_DataGrid_ctl6_ctl3", ""); $this->verifyConfirmation("Are you sure?"); $this->verifyTextPresent("Extreme Programming Explained : Embrace Change",''); } diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket278.page b/tests/FunctionalTests/tickets/protected/pages/Ticket278.page index 75aed4d9..e7341bcc 100644 --- a/tests/FunctionalTests/tickets/protected/pages/Ticket278.page +++ b/tests/FunctionalTests/tickets/protected/pages/Ticket278.page @@ -4,16 +4,16 @@
- - + - + - + Event.OnLoad(function() { diff --git a/tests/FunctionalTests/tickets/tests/Ticket274TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket274TestCase.php index ae976a7f..6a5ae0ff 100644 --- a/tests/FunctionalTests/tickets/tests/Ticket274TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket274TestCase.php @@ -9,15 +9,15 @@ class Ticket274TestCase extends SeleniumTestCase $this->assertTitle('Verifying Ticket 274'); $this->assertNotVisible($base.'validator1'); $this->assertNotVisible($base.'validator2'); - - $this->click($base.'button1'); + + $this->clickAndWait($base.'button1'); $this->assertVisible($base.'validator1'); $this->assertNotVisible($base.'validator2'); - + $this->type($base.'MyDate', 'asd'); - $this->click($base.'button1'); + $this->clickAndWait($base.'button1'); $this->assertVisible($base.'validator1'); - $this->assertNotVisible($base.'validator2'); + $this->assertNotVisible($base.'validator2'); } } -- cgit v1.2.3