summaryrefslogtreecommitdiff
path: root/tests/FunctionalTests
diff options
context:
space:
mode:
Diffstat (limited to 'tests/FunctionalTests')
-rw-r--r--tests/FunctionalTests/features/protected/pages/ValidatorEffects.page44
-rw-r--r--tests/FunctionalTests/quickstart/Controls/DataGrid3TestCase.php24
-rw-r--r--tests/FunctionalTests/tickets/protected/pages/Ticket278.page18
-rw-r--r--tests/FunctionalTests/tickets/tests/Ticket274TestCase.php10
4 files changed, 48 insertions, 48 deletions
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 @@
<fieldset id="quickRegistration">
<legend>Create New Account</legend>
-<com:TClientScript UsingPradoScripts="effects,logger" />
+<com:TClientScript PradoScripts="effects,logger" />
<div class="username">
- Username:
+ Username:
<com:TTextBox ID="Username" />
<com:TRequiredFieldValidator
ID="UsernameVal"
ControlToValidate="Username"
- ValidationGroup="registration"
+ ValidationGroup="registration"
ControlCssClass="required"
Display="Dynamic"
ErrorMessage="a username is required.">
<prop:ClientSide.OnError>
- Effect.Shake(validator.control);
- Effect.Appear(validator.message);
+ Effect.Shake(sender.control);
+ Effect.Appear(sender.message);
</prop:ClientSide.OnError>
<prop:ClientSide.OnSuccess>
- Effect.Fade(validator.message);
+ Effect.Fade(sender.message);
</prop:ClientSide.OnSuccess>
- </com:TRequiredFieldValidator>
+ </com:TRequiredFieldValidator>
</div>
<div class="password">
Password
<com:TTextBox ID="Password" TextMode="Password" />
- <!-- alternate synatx : see
+ <!-- alternate synatx : see
http://encytemedia.com/blog/articles/2006/03/07/prototype-gets-some-serious-syntactic-sugar
-->
<com:TRequiredFieldValidator
ID="PasswordVal"
ControlToValidate="Password"
- ValidationGroup="registration"
+ ValidationGroup="registration"
ControlCssClass="required"
Display="Dynamic"
- ClientSide.OnError="validator.message.visualEffect('appear')"
- ClientSide.OnSuccess="validator.message.visualEffect('fade')"
- ErrorMessage="a password is required." />
-</div>
+ ClientSide.OnError="sender.message.visualEffect('appear')"
+ ClientSide.OnSuccess="sender.message.visualEffect('fade')"
+ ErrorMessage="a password is required." />
+</div>
<div class="create">
<com:TButton ID="Create" ValidationGroup="registration" Text="Create New Account"/>
</div>
@@ -54,7 +54,7 @@
<div class="username">
Login Name:
<com:TTextBox ID="UserID" />
-
+
<com:TRequiredFieldValidator
ID="UserVal1"
ControlToValidate="UserID"
@@ -78,26 +78,26 @@
<com:TButton ID="login" ValidationGroup="signin" CssClass="button" Text="Sign In" />
<div class="validation">
- <com:TValidationSummary
+ <com:TValidationSummary
ID="summary2"
ValidationGroup="signin"
Display="Dynamic"
- ClientSide.OnHideSummary="Effect.Squish(summary.messages)"
+ ClientSide.OnHideSummary="Effect.Squish(sender.messages)"
HeaderText="<p>You could not login because</p>">
<prop:ClientSide.OnShowSummary>
- Effect.Appear(summary.messages)
- Effect.Shake(summary.messages,{ queue: 'end'})
- </prop:ClientSide.OnShowSummary>
+ Effect.Appear(sender.messages)
+ Effect.Shake(sender.messages,{ queue: 'end'})
+ </prop:ClientSide.OnShowSummary>
</com:TValidationSummary>
</div>
</fieldset>
-<com:TLinkButton ID="linkButton1"
- Text="Click Me"
+<com:TLinkButton ID="linkButton1"
+ Text="Click Me"
OnClick="linkButton1_Clicked">
<prop:Attributes.onclick>
- if(!confirm('<%= Prado::localize("Confirm Delete") %>'))
+ if(!confirm('<%= Prado::localize("Confirm Delete") %>'))
return false;
</prop:Attributes.onclick>
</com:TLinkButton>
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 @@
<com:TTextBox ID="text1" />
<com:TRequiredFieldValidator
ID="validator1"
- ControlToValidate="text1"
+ ControlToValidate="text1"
ErrorMessage="Text 1 is required" />
<div>
<com:TCheckBox ID="check1" Text="More..." />
</div>
-
- <com:TPanel ID="panel1" Style="display:none" >
+
+ <com:TPanel ID="panel1" Style="display:none" >
<com:TLabel ForControl="text2" Text="Text 2:" />
<com:TTextBox ID="text2" />
-
+
<com:TRequiredFieldValidator
ID="validator2"
ControlToValidate="text2"
@@ -21,14 +21,14 @@
OnPreRender="validate2_onPostValidate"
ErrorMessage="Text 2 is required">
<prop:ClientSide.OnValidate>
- validator.enabled = $("<%= $this->check1->ClientID %>").checked;
+ sender.enabled = $("<%= $this->check1->ClientID %>").checked;
</prop:ClientSide.OnValidate>
- </com:TRequiredFieldValidator>
-
+ </com:TRequiredFieldValidator>
+
</com:TPanel>
-
+
<com:TButton ID="button1" Text="Submit!" />
-
+
<com:TClientScript>
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');
}
}
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-01 22:29:41 +0000