From 2cc93773feb5e76d2dd002b1dcd463a01d606794 Mon Sep 17 00:00:00 2001 From: xue <> Date: Fri, 28 Apr 2006 11:10:06 +0000 Subject: Merge from 3.0 branch till 985. --- .../features/protected/application.xml | 3 +++ .../features/protected/controls/LabeledTextBox.tpl | 2 ++ .../features/protected/controls/LabeledTextbox.php | 25 +++++++++++++++++++ .../features/protected/pages/CompositeControl.page | 12 +++++++++ .../features/protected/pages/HtmlArea.page | 29 ++++++++++++++++------ .../features/protected/pages/ValidatorEffects.page | 12 ++++++--- .../features/tests/CompositeControlTestCase.php | 23 +++++++++++++++++ .../tickets/protected/pages/Ticket68.page | 25 +++++++++++++++++++ 8 files changed, 121 insertions(+), 10 deletions(-) create mode 100644 tests/FunctionalTests/features/protected/controls/LabeledTextBox.tpl create mode 100644 tests/FunctionalTests/features/protected/controls/LabeledTextbox.php create mode 100644 tests/FunctionalTests/features/protected/pages/CompositeControl.page create mode 100644 tests/FunctionalTests/features/tests/CompositeControlTestCase.php create mode 100644 tests/FunctionalTests/tickets/protected/pages/Ticket68.page (limited to 'tests') diff --git a/tests/FunctionalTests/features/protected/application.xml b/tests/FunctionalTests/features/protected/application.xml index 642152cc..9153f3f7 100644 --- a/tests/FunctionalTests/features/protected/application.xml +++ b/tests/FunctionalTests/features/protected/application.xml @@ -1,6 +1,9 @@ + + + diff --git a/tests/FunctionalTests/features/protected/controls/LabeledTextBox.tpl b/tests/FunctionalTests/features/protected/controls/LabeledTextBox.tpl new file mode 100644 index 00000000..276d03b2 --- /dev/null +++ b/tests/FunctionalTests/features/protected/controls/LabeledTextBox.tpl @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/tests/FunctionalTests/features/protected/controls/LabeledTextbox.php b/tests/FunctionalTests/features/protected/controls/LabeledTextbox.php new file mode 100644 index 00000000..9a50d095 --- /dev/null +++ b/tests/FunctionalTests/features/protected/controls/LabeledTextbox.php @@ -0,0 +1,25 @@ +ensureChildControls(); + } + + public function getTextBox() + { + return $this->getRegisteredObject('textbox'); + } + + public function getLabel() + { + return $this->getRegisteredObject('label'); + } +} + +?> diff --git a/tests/FunctionalTests/features/protected/pages/CompositeControl.page b/tests/FunctionalTests/features/protected/pages/CompositeControl.page new file mode 100644 index 00000000..b135445a --- /dev/null +++ b/tests/FunctionalTests/features/protected/pages/CompositeControl.page @@ -0,0 +1,12 @@ + +

Composite Control Test

+
+
+ + +user->TextBox->Text != "" %> > +

Result

+ User: <%= $this->user->TextBox->Text %> Pass: <%= $this->pass->TextBox->Text %> +
+ +
\ No newline at end of file diff --git a/tests/FunctionalTests/features/protected/pages/HtmlArea.page b/tests/FunctionalTests/features/protected/pages/HtmlArea.page index 8b56f48d..3936e68c 100644 --- a/tests/FunctionalTests/features/protected/pages/HtmlArea.page +++ b/tests/FunctionalTests/features/protected/pages/HtmlArea.page @@ -1,10 +1,25 @@ -<%@ Application.Globalization.Charset="GB2312" %> + - - - plugins : "contextmenu,paste", - language: "zh_CN" - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/FunctionalTests/features/protected/pages/ValidatorEffects.page b/tests/FunctionalTests/features/protected/pages/ValidatorEffects.page index 47d99969..da03f9b8 100644 --- a/tests/FunctionalTests/features/protected/pages/ValidatorEffects.page +++ b/tests/FunctionalTests/features/protected/pages/ValidatorEffects.page @@ -4,7 +4,7 @@
Create New Account - +
Username: @@ -81,8 +81,14 @@ + Display="Dynamic" + ClientValidation.OnHideSummary="Effect.Squish(summary.messages)" + HeaderText="

You could not login because

"> + + Effect.Appear(summary.messages) + Effect.Shake(summary.messages,{ queue: 'end'}) + +
diff --git a/tests/FunctionalTests/features/tests/CompositeControlTestCase.php b/tests/FunctionalTests/features/tests/CompositeControlTestCase.php new file mode 100644 index 00000000..dda3f63b --- /dev/null +++ b/tests/FunctionalTests/features/tests/CompositeControlTestCase.php @@ -0,0 +1,23 @@ +open("features/index.php?page=CompositeControl", ""); + $this->verifyTextPresent("Composite Control Test", ""); + $this->type("{$base}user_textbox", "Hello"); + $this->type("{$base}pass_textbox", "world"); + $this->clickAndWait("//input[@type='submit' and @value='Submit']", ""); + $this->verifyTextPresent("Result", ""); + $this->verifyTextPresent("User: Hello Pass: world", ""); + } + +} + +?> diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket68.page b/tests/FunctionalTests/tickets/protected/pages/Ticket68.page new file mode 100644 index 00000000..3936e68c --- /dev/null +++ b/tests/FunctionalTests/tickets/protected/pages/Ticket68.page @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- cgit v1.2.3