From 77acfefedf80a2c30f8a0f71b5b6d33d1b9fd144 Mon Sep 17 00:00:00 2001 From: Pratik Naik Date: Thu, 19 Mar 2009 23:45:08 +0000 Subject: Make Active Resource use ActiveModel::Errors --- activeresource/test/base_errors_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activeresource/test') diff --git a/activeresource/test/base_errors_test.rb b/activeresource/test/base_errors_test.rb index 7ae92c7d98..517babd16b 100644 --- a/activeresource/test/base_errors_test.rb +++ b/activeresource/test/base_errors_test.rb @@ -28,7 +28,7 @@ class BaseErrorsTest < Test::Unit::TestCase def test_should_iterate_over_errors errors = [] - @person.errors.each { |attribute, message| errors << [attribute, message] } + @person.errors.each { |attribute, message| errors << [attribute.to_s, message] } assert errors.include?(["name", "can't be blank"]) end -- cgit v1.2.3 From 09afbfd47f8180bb6d5f907abdeab6badeda879e Mon Sep 17 00:00:00 2001 From: Pratik Naik Date: Fri, 20 Mar 2009 18:51:01 +0000 Subject: Fix ActiveResource::Errors deprecation messages --- activeresource/test/base_errors_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activeresource/test') diff --git a/activeresource/test/base_errors_test.rb b/activeresource/test/base_errors_test.rb index 517babd16b..8c177c8006 100644 --- a/activeresource/test/base_errors_test.rb +++ b/activeresource/test/base_errors_test.rb @@ -21,9 +21,9 @@ class BaseErrorsTest < Test::Unit::TestCase def test_should_parse_errors_to_individual_attributes assert @person.errors.invalid?(:name) - assert_equal "can't be blank", @person.errors.on(:age) + assert_equal ["can't be blank"], @person.errors[:age] assert_equal ["can't be blank", "must start with a letter"], @person.errors[:name] - assert_equal "Person quota full for today.", @person.errors.on_base + assert_equal ["Person quota full for today."], @person.errors[:base] end def test_should_iterate_over_errors -- cgit v1.2.3 From 320933205e16164ff55245aef1e95fb06e609d06 Mon Sep 17 00:00:00 2001 From: Pratik Naik Date: Sat, 21 Mar 2009 18:29:15 +0000 Subject: Deprecate Errors#on_base/add_to_base/invalid?/each_full --- activeresource/test/abstract_unit.rb | 3 +++ activeresource/test/base_errors_test.rb | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'activeresource/test') diff --git a/activeresource/test/abstract_unit.rb b/activeresource/test/abstract_unit.rb index 0f11ea482a..ce9371d050 100644 --- a/activeresource/test/abstract_unit.rb +++ b/activeresource/test/abstract_unit.rb @@ -14,6 +14,9 @@ require 'setter_trap' ActiveResource::Base.logger = Logger.new("#{File.dirname(__FILE__)}/debug.log") +# Show backtraces for deprecated behavior for quicker cleanup. +ActiveSupport::Deprecation.debug = true + def uses_gem(gem_name, test_name, version = '> 0') gem gem_name.to_s, version require gem_name.to_s diff --git a/activeresource/test/base_errors_test.rb b/activeresource/test/base_errors_test.rb index 8c177c8006..28813821df 100644 --- a/activeresource/test/base_errors_test.rb +++ b/activeresource/test/base_errors_test.rb @@ -20,7 +20,7 @@ class BaseErrorsTest < Test::Unit::TestCase end def test_should_parse_errors_to_individual_attributes - assert @person.errors.invalid?(:name) + assert @person.errors[:name].any? assert_equal ["can't be blank"], @person.errors[:age] assert_equal ["can't be blank", "must start with a letter"], @person.errors[:name] assert_equal ["Person quota full for today."], @person.errors[:base] @@ -34,7 +34,7 @@ class BaseErrorsTest < Test::Unit::TestCase def test_should_iterate_over_full_errors errors = [] - @person.errors.each_full { |message| errors << message } + @person.errors.to_a.each { |message| errors << message } assert errors.include?("Name can't be blank") end -- cgit v1.2.3