diff options
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/Rakefile | 4 | ||||
| -rw-r--r-- | activesupport/lib/active_support.rb | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/module/attr_internal.rb | 4 | ||||
| -rw-r--r-- | activesupport/lib/active_support/deprecation.rb | 1 | ||||
| -rw-r--r-- | activesupport/lib/active_support/vendor/builder/xmlbase.rb | 2 | ||||
| -rw-r--r-- | activesupport/test/core_ext/name_error_test.rb | 7 | ||||
| -rw-r--r-- | activesupport/test/core_ext/object_and_class_ext_test.rb | 2 |
7 files changed, 10 insertions, 12 deletions
diff --git a/activesupport/Rakefile b/activesupport/Rakefile index 7a6825cad8..84e93079d3 100644 --- a/activesupport/Rakefile +++ b/activesupport/Rakefile @@ -18,7 +18,7 @@ task :default => :test Rake::TestTask.new { |t| t.pattern = 'test/**/*_test.rb' t.verbose = true - t.warning = false + t.warning = true } # Create compressed packages @@ -79,4 +79,4 @@ task :release => [ :package ] do puts release_command system(release_command) end -end
\ No newline at end of file +end diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb index 0c0762ad8e..4289e57865 100644 --- a/activesupport/lib/active_support.rb +++ b/activesupport/lib/active_support.rb @@ -39,4 +39,4 @@ require 'active_support/option_merger' require 'active_support/values/time_zone' -require 'active_support/json'
\ No newline at end of file +require 'active_support/json' diff --git a/activesupport/lib/active_support/core_ext/module/attr_internal.rb b/activesupport/lib/active_support/core_ext/module/attr_internal.rb index c793da7159..7f2fb9641b 100644 --- a/activesupport/lib/active_support/core_ext/module/attr_internal.rb +++ b/activesupport/lib/active_support/core_ext/module/attr_internal.rb @@ -15,8 +15,8 @@ class Module # Declare attributes backed by 'internal' instance variables names. def attr_internal_accessor(*attrs) - attr_internal_reader *attrs - attr_internal_writer *attrs + attr_internal_reader(*attrs) + attr_internal_writer(*attrs) end alias_method :attr_internal, :attr_internal_accessor diff --git a/activesupport/lib/active_support/deprecation.rb b/activesupport/lib/active_support/deprecation.rb index 99c27ee9d1..99dbad1f7e 100644 --- a/activesupport/lib/active_support/deprecation.rb +++ b/activesupport/lib/active_support/deprecation.rb @@ -18,6 +18,7 @@ module ActiveSupport # Have deprecations been silenced? def silenced? + @silenced = false unless defined?(@silenced) @silenced end diff --git a/activesupport/lib/active_support/vendor/builder/xmlbase.rb b/activesupport/lib/active_support/vendor/builder/xmlbase.rb index 950d5891e1..b0485636ea 100644 --- a/activesupport/lib/active_support/vendor/builder/xmlbase.rb +++ b/activesupport/lib/active_support/vendor/builder/xmlbase.rb @@ -53,7 +53,7 @@ module Builder unless text.nil? raise ArgumentError, "XmlMarkup cannot mix a text argument with a block" end - _capture_outer_self(block) if @self.nil? + _capture_outer_self(block) unless defined?(@self) && !@self.nil? _indent _start_tag(sym, attrs) _newline diff --git a/activesupport/test/core_ext/name_error_test.rb b/activesupport/test/core_ext/name_error_test.rb index e49b88eb38..d038875303 100644 --- a/activesupport/test/core_ext/name_error_test.rb +++ b/activesupport/test/core_ext/name_error_test.rb @@ -1,8 +1,6 @@ -require 'test/unit' -require File.dirname(__FILE__) + '/../../lib/active_support/core_ext/name_error' +require File.dirname(__FILE__) + '/../abstract_unit' class NameErrorTest < Test::Unit::TestCase - def test_name_error_should_set_missing_name begin SomeNameThatNobodyWillUse____Really ? 1 : 0 @@ -13,7 +11,7 @@ class NameErrorTest < Test::Unit::TestCase assert exc.missing_name?("NameErrorTest::SomeNameThatNobodyWillUse____Really") end end - + def test_missing_method_should_ignore_missing_name begin some_method_that_does_not_exist @@ -23,5 +21,4 @@ class NameErrorTest < Test::Unit::TestCase assert ! exc.missing_name?(:Foo) end end - end diff --git a/activesupport/test/core_ext/object_and_class_ext_test.rb b/activesupport/test/core_ext/object_and_class_ext_test.rb index 73121ca966..9daf8d0ac4 100644 --- a/activesupport/test/core_ext/object_and_class_ext_test.rb +++ b/activesupport/test/core_ext/object_and_class_ext_test.rb @@ -78,7 +78,7 @@ class ObjectTests < Test::Unit::TestCase foo = Foo.new assert foo.extended_by.include?(Bar) foo.extend(Baz) - assert ([Bar, Baz] - foo.extended_by).empty?, "Expected Bar, Baz in #{foo.extended_by.inspect}" + assert(([Bar, Baz] - foo.extended_by).empty?, "Expected Bar, Baz in #{foo.extended_by.inspect}") end def test_extend_with_included_modules_from |