diff options
| -rw-r--r-- | buildscripts/chmbuilder/ChmQuickstartBuilder.php | 2 | ||||
| -rw-r--r-- | buildscripts/jsbuilder/build.php | 6 | ||||
| -rw-r--r-- | tests/FunctionalTests/validators/tests/DatePickerTestCase.php | 5 |
3 files changed, 8 insertions, 5 deletions
diff --git a/buildscripts/chmbuilder/ChmQuickstartBuilder.php b/buildscripts/chmbuilder/ChmQuickstartBuilder.php index 6087d5d8..7a954d4a 100644 --- a/buildscripts/chmbuilder/ChmQuickstartBuilder.php +++ b/buildscripts/chmbuilder/ChmQuickstartBuilder.php @@ -320,7 +320,7 @@ EOD; protected function li_to_string($li)
{
- $content = '';
+ $contents = '';
foreach($li['params'] as $param)
{
$contents .= "\t<LI>";
diff --git a/buildscripts/jsbuilder/build.php b/buildscripts/jsbuilder/build.php index 163ef37d..391899e6 100644 --- a/buildscripts/jsbuilder/build.php +++ b/buildscripts/jsbuilder/build.php @@ -100,12 +100,12 @@ $libraries = array( //active controls
'ajax.js' => array(
'prototype/ajax.js',
- 'prado/ajax.js',
- 'extra/json.js',
+// 'prado/ajax.js',
+// 'extra/json.js',
'effects/controls.js',
'effects/dragdrop.js',
'effects/slider.js',
- 'prado/activecontrols.js'
+// 'prado/activecontrols.js'
),
//logging
'logger.js' => array(
diff --git a/tests/FunctionalTests/validators/tests/DatePickerTestCase.php b/tests/FunctionalTests/validators/tests/DatePickerTestCase.php index 8c40ee65..ab7ab897 100644 --- a/tests/FunctionalTests/validators/tests/DatePickerTestCase.php +++ b/tests/FunctionalTests/validators/tests/DatePickerTestCase.php @@ -17,7 +17,10 @@ class DatePickerTestCase extends SeleniumTestCase $this->click("{$base}submit1");
$this->assertVisible("{$base}validator1", "");
$this->assertNotVisible("{$base}validator2", "");
- $this->assertNotVisible("{$base}validator4", "");
+
+ //the range validator is visible because the date is a drop down list
+ //thus has default value != ""
+ $this->assertVisible("{$base}validator4", "");
$this->assertVisible("{$base}validator5", "");
$this->assertNotVisible("{$base}validator6", "");
$this->assertVisible("{$base}validator8", "");
|