diff options
| author | ctrlaltca@gmail.com <> | 2012-04-13 17:00:38 +0000 |
|---|---|---|
| committer | ctrlaltca@gmail.com <> | 2012-04-13 17:00:38 +0000 |
| commit | 4bb1e22981b24cb3ab1c4f9b17937f1b58336af5 (patch) | |
| tree | fc81dacb6b907a22c29e5dfbc44168314f0788d9 | |
| parent | 303b4603cfb9427046cfbf1958606f4625ab20ad (diff) | |
Minor regression fix in TAutoComplete's js;
Fixed ActiveDropDownListtestCase, added a dummy selenium.css to avoid a 404 error while debugging test cases
4 files changed, 3 insertions, 3 deletions
diff --git a/.gitattributes b/.gitattributes index 15f87658..94651891 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3865,6 +3865,7 @@ tests/FunctionalTests/quickstart/Controls/Wizard3TestCase.php -text tests/FunctionalTests/quickstart/Controls/Wizard4TestCase.php -text tests/FunctionalTests/quickstart/Controls/Wizard5TestCase.php -text tests/FunctionalTests/quickstart/Fundamentals/HangmanTestCase.php -text +tests/FunctionalTests/selenium.css -text tests/FunctionalTests/tickets.php -text tests/FunctionalTests/tickets/index.php -text tests/FunctionalTests/tickets/index700.php -text diff --git a/framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js b/framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js index 24c1f30d..7dbdbe2a 100644 --- a/framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js +++ b/framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js @@ -101,6 +101,7 @@ Prado.WebUI.TAutoComplete = Class.extend(Prado.WebUI.TAutoComplete, initialize : function(options)
{
this.options = options;
+ this.observers = new Array();
this.hasResults = false;
this.baseInitialize(options.ID, options.ResultPanel, options);
Object.extend(this.options,
diff --git a/tests/FunctionalTests/active-controls/tests/ActiveDropDownListTestCase.php b/tests/FunctionalTests/active-controls/tests/ActiveDropDownListTestCase.php index cb5d349c..9dd210df 100644 --- a/tests/FunctionalTests/active-controls/tests/ActiveDropDownListTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/ActiveDropDownListTestCase.php @@ -21,9 +21,7 @@ class ActiveDropDownListTestCase extends SeleniumTestCase $this->pause(800); $this->assertSelected("list1", "item 2"); - // due to clearing selection and then updating the selection - // otherwise it should not fire the changed event (fired by js because of change to options). - $this->assertText("label1", "Label 1"); + $this->assertText("label1", "Selection 1: value 1"); $this->select("list1", "item 1"); $this->pause(800); diff --git a/tests/FunctionalTests/selenium.css b/tests/FunctionalTests/selenium.css new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/tests/FunctionalTests/selenium.css |