diff options
| -rw-r--r-- | .gitattributes | 3 | ||||
| -rw-r--r-- | tests/FunctionalTests/tickets/protected/pages/Ticket578.page | 11 | ||||
| -rw-r--r-- | tests/FunctionalTests/tickets/protected/pages/Ticket578.php | 13 | ||||
| -rw-r--r-- | tests/FunctionalTests/tickets/tests/Ticket578TestCase.php | 29 |
4 files changed, 56 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index eaca3230..dffda353 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2405,6 +2405,8 @@ tests/FunctionalTests/tickets/protected/pages/Ticket54.page -text tests/FunctionalTests/tickets/protected/pages/Ticket54Master.php -text tests/FunctionalTests/tickets/protected/pages/Ticket54Master.tpl -text tests/FunctionalTests/tickets/protected/pages/Ticket573.page -text +tests/FunctionalTests/tickets/protected/pages/Ticket578.page -text +tests/FunctionalTests/tickets/protected/pages/Ticket578.php -text tests/FunctionalTests/tickets/protected/pages/Ticket68.page -text tests/FunctionalTests/tickets/protected/pages/Ticket72.page -text tests/FunctionalTests/tickets/protected/pages/Ticket72.php -text @@ -2433,6 +2435,7 @@ tests/FunctionalTests/tickets/tests/Ticket488TestCase.php -text tests/FunctionalTests/tickets/tests/Ticket521TestCase.php -text tests/FunctionalTests/tickets/tests/Ticket54TestCase.php -text tests/FunctionalTests/tickets/tests/Ticket573TestCase.php -text +tests/FunctionalTests/tickets/tests/Ticket578TestCase.php -text tests/FunctionalTests/tickets/tests/Ticket72TestCase.php -text tests/FunctionalTests/tickets/tests/Ticket93TestCase.php -text tests/FunctionalTests/validators.php -text diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket578.page b/tests/FunctionalTests/tickets/protected/pages/Ticket578.page new file mode 100644 index 00000000..e933fd33 --- /dev/null +++ b/tests/FunctionalTests/tickets/protected/pages/Ticket578.page @@ -0,0 +1,11 @@ +<com:TContent ID="Content">
+<h2 class="defect">ActiveControls broken by presence of THtmlArea in the .page</h2>
+
+ <com:TActiveButton ID="button1" Text="Button 1"
+ OnClick="button2_onclick"/>
+
+ <com:TActiveLabel ID="label1" Text="Label 1" />
+
+ <com:THtmlArea ID="text1" />
+
+</com:TContent>
\ No newline at end of file diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket578.php b/tests/FunctionalTests/tickets/protected/pages/Ticket578.php new file mode 100644 index 00000000..7d7dbaac --- /dev/null +++ b/tests/FunctionalTests/tickets/protected/pages/Ticket578.php @@ -0,0 +1,13 @@ +<?php
+Prado::using('System.Web.UI.ActiveControls.*');
+class Ticket578 extends TPage
+{
+
+ function button2_onclick($sender, $param)
+ {
+ $this->label1->Text = "Button 1 was clicked : " . htmlspecialchars($this->text1->Text);
+ }
+
+}
+
+?>
\ No newline at end of file diff --git a/tests/FunctionalTests/tickets/tests/Ticket578TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket578TestCase.php new file mode 100644 index 00000000..f95af91b --- /dev/null +++ b/tests/FunctionalTests/tickets/tests/Ticket578TestCase.php @@ -0,0 +1,29 @@ +<?php
+
+class Ticket578TestCase extends SeleniumTestCase
+{
+ function test()
+ {
+ $base = 'ctl0_Content_';
+ $this->open('tickets/index.php?page=Ticket578');
+ $this->verifyTitle("Verifying Ticket 578", "");
+
+ $this->assertText("{$base}label1", "Label 1");
+ $this->click("{$base}button1", "");
+ $this->pause(800);
+ $this->assertText("{$base}label1", "Button 1 was clicked : ");
+
+ $this->store($this->setTinymceHtml("{$base}text1", "helloworld"),"t2");
+ $this->click("{$base}button1", "");
+ $this->pause(800);
+ $this->assertText("{$base}label1", "Button 1 was clicked : helloworld");
+ }
+
+ function setTinymceHtml($id, $text)
+ {
+ $tinymce = "this.browserbot.getCurrentWindow().tinyMCE.getInstanceById('{$id}')";
+ return 'javascript{'."{$tinymce}.setHTML('{$text}') ? 0 : 1".'}';
+ }
+}
+
+?>
\ No newline at end of file |