diff options
author | Thomas Fuchs <thomas@fesch.at> | 2005-09-28 08:20:47 +0000 |
---|---|---|
committer | Thomas Fuchs <thomas@fesch.at> | 2005-09-28 08:20:47 +0000 |
commit | 516dc2c0f16cf187f981b5e8648a7f7f1b31d190 (patch) | |
tree | d645e19a02ab5eb371302fe4742b7fd7e0a1a1e2 /actionpack/test/template/javascript_helper_test.rb | |
parent | dd21e9ae39a2dc4b7eb607ff2c200c864fa19b28 (diff) | |
download | rails-516dc2c0f16cf187f981b5e8648a7f7f1b31d190.tar.gz rails-516dc2c0f16cf187f981b5e8648a7f7f1b31d190.tar.bz2 rails-516dc2c0f16cf187f981b5e8648a7f7f1b31d190.zip |
Update script.aculo.us to 1.5_rc2, and Prototype to 1.4.0_pre7
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2386 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test/template/javascript_helper_test.rb')
-rw-r--r-- | actionpack/test/template/javascript_helper_test.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/test/template/javascript_helper_test.rb b/actionpack/test/template/javascript_helper_test.rb index 63c364bd1d..caafe5387b 100644 --- a/actionpack/test/template/javascript_helper_test.rb +++ b/actionpack/test/template/javascript_helper_test.rb @@ -23,6 +23,9 @@ class JavaScriptHelperTest < Test::Unit::TestCase def test_define_javascript_functions # check if prototype.js is included first assert_not_nil define_javascript_functions.split("\n")[1].match(/Prototype JavaScript framework/) + + # check that scriptaculous.js is not in here, only needed if loaded remotely + assert_nil define_javascript_functions.split("\n")[1].match(/var Scriptaculous = \{/) end def test_escape_javascript |