Changeset 6772
- Timestamp:
- 05/18/07 21:16:43 (1 year ago)
- Files:
-
- trunk/activesupport/lib/active_support/json/encoding.rb (modified) (1 diff)
- trunk/activesupport/test/test_test.rb (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/activesupport/lib/active_support/json/encoding.rb
r6443 r6772 1 1 require 'active_support/json/variable' 2 2 3 require 'active_support/json/encoders/object' # Require this file explicitly for rdoc 4 Dir[File.dirname(__FILE__) + '/encoders/**/*.rb'].each { |file| require file[0..-4] } 3 require 'active_support/json/encoders/object' # Require explicitly for rdoc. 4 Dir["#{File.dirname(__FILE__)}/encoders/**/*.rb"].each do |file| 5 basename = File.basename(file, '.rb') 6 unless basename == 'object' 7 require "active_support/json/encoders/#{basename}" 8 end 9 end 5 10 6 11 module ActiveSupport trunk/activesupport/test/test_test.rb
r6701 r6772 50 50 def test_expression_is_evaluated_in_the_appropriate_scope 51 51 local_scope = 'foo' 52 assert_difference 'local_scope; @object.num'do53 @object.increment52 silence_warnings do 53 assert_difference('local_scope; @object.num') { @object.increment } 54 54 end 55 55 end
