aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorMarcel Molina <marcel@vernix.org>2006-07-13 03:32:38 +0000
committerMarcel Molina <marcel@vernix.org>2006-07-13 03:32:38 +0000
commit2482e17e5794b1728b1208aa1eaf58cef3aa0ab0 (patch)
tree9c142e0c51d3a6af8c662daf832444b8f25a84a9 /actionpack
parentc80c6364d93bd9caa262cc0d3f9a507d2d2d3af7 (diff)
downloadrails-2482e17e5794b1728b1208aa1eaf58cef3aa0ab0.tar.gz
rails-2482e17e5794b1728b1208aa1eaf58cef3aa0ab0.tar.bz2
rails-2482e17e5794b1728b1208aa1eaf58cef3aa0ab0.zip
Get rid of constant redefinition warnings when running AP tests
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4610 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_view/helpers/prototype_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/prototype_helper.rb b/actionpack/lib/action_view/helpers/prototype_helper.rb
index 4c593a40f2..531ff0b2ed 100644
--- a/actionpack/lib/action_view/helpers/prototype_helper.rb
+++ b/actionpack/lib/action_view/helpers/prototype_helper.rb
@@ -815,8 +815,8 @@ module ActionView
end
class JavaScriptCollectionProxy < JavaScriptProxy #:nodoc:
- ENUMERABLE_METHODS_WITH_RETURN = [:all, :any, :collect, :map, :detect, :find, :find_all, :select, :max, :min, :partition, :reject, :sort_by]
- ENUMERABLE_METHODS = ENUMERABLE_METHODS_WITH_RETURN + [:each]
+ ENUMERABLE_METHODS_WITH_RETURN = [:all, :any, :collect, :map, :detect, :find, :find_all, :select, :max, :min, :partition, :reject, :sort_by] unless defined? ENUMERABLE_METHODS_WITH_RETURN
+ ENUMERABLE_METHODS = ENUMERABLE_METHODS_WITH_RETURN + [:each] unless defined? ENUMERABLE_METHODS
attr_reader :generator
delegate :arguments_for_call, :to => :generator