Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 4610

Show
Ignore:
Timestamp:
07/13/06 03:32:38 (2 years ago)
Author:
marcel
Message:

Get rid of constant redefinition warnings when running AP tests

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/actionpack/lib/action_view/helpers/prototype_helper.rb

    r4375 r4610  
    816816 
    817817    class JavaScriptCollectionProxy < JavaScriptProxy #:nodoc: 
    818       ENUMERABLE_METHODS_WITH_RETURN = [:all, :any, :collect, :map, :detect, :find, :find_all, :select, :max, :min, :partition, :reject, :sort_by] 
    819       ENUMERABLE_METHODS = ENUMERABLE_METHODS_WITH_RETURN + [:each] 
     818      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 
     819      ENUMERABLE_METHODS = ENUMERABLE_METHODS_WITH_RETURN + [:each] unless defined? ENUMERABLE_METHODS 
    820820      attr_reader :generator 
    821821      delegate :arguments_for_call, :to => :generator 
  • trunk/activesupport/lib/active_support/core_ext/hash/conversions.rb

    r4607 r4610  
    1414          ::TrueClass  => "boolean", 
    1515          ::FalseClass => "boolean" 
    16         } 
     16        } unless defined? XML_TYPE_NAMES 
    1717 
    1818        XML_FORMATTING = { 
     
    2020          "datetime" => Proc.new { |time| time.xmlschema }, 
    2121          "binary"   => Proc.new { |binary| Base64.encode64(binary) } 
    22         } 
     22        } unless defined? XML_FORMATTING 
    2323 
    2424        def self.included(klass)