diff --git a/activeresource/CHANGELOG b/activeresource/CHANGELOG index 70bc5675e27510eb98bd33eaacb9c84b6fe52609..71d9067dc93db60e0403b71ccd2574f5369e7de7 100644 --- a/activeresource/CHANGELOG +++ b/activeresource/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Increase ActiveResource::Base test coverage. Closes #7173, #7174 [Rich Collins] + * Interpret 422 Unprocessable Entity as ResourceInvalid. #7097 [dkubb] * Mega documentation patches. #7025, #7069 [rwdaigle] diff --git a/activeresource/test/abstract_unit.rb b/activeresource/test/abstract_unit.rb index f19635826c50a00be152e334180667c32befffac..08b41329a71fc21038eec17d27ab171d692101fe 100644 --- a/activeresource/test/abstract_unit.rb +++ b/activeresource/test/abstract_unit.rb @@ -6,3 +6,31 @@ require 'active_support/breakpoint' ActiveResource::Base.logger = Logger.new("#{File.dirname(__FILE__)}/debug.log") + +class SetterTrap < Builder::BlankSlate + class << self + def rollback_sets(obj) + returning yield(setter_trap = new(obj)) do + setter_trap.rollback_sets + end + end + end + + def initialize(obj) + @cache = {} + @obj = obj + end + + def respond_to?(method) + @obj.respond_to?(method) + end + + def method_missing(method, *args, &proc) + @cache[method] = @obj.send(method.to_s[0 ... -1]) if method.to_s[-1 .. -1] == "=" unless @cache[method] + @obj.send method, *args, &proc + end + + def rollback_sets + @cache.each { |k, v| @obj.send k, v } + end +end \ No newline at end of file diff --git a/activeresource/test/base_test.rb b/activeresource/test/base_test.rb index f9f2b24c72c7a678ab3239e91ab5e71b4c31852d..040bd02b52cea4cd7620cfdb222dff0ebad8d73e 100644 --- a/activeresource/test/base_test.rb +++ b/activeresource/test/base_test.rb @@ -137,6 +137,27 @@ def test_prefix assert_equal "/", Person.prefix assert_equal Set.new, Person.send(:prefix_parameters) end + + def test_set_prefix + SetterTrap.rollback_sets(Person) do |person_class| + person_class.prefix = "the_prefix" + assert_equal "the_prefix", person_class.prefix + end + end + + def test_set_prefix_with_inline_keys + SetterTrap.rollback_sets(Person) do |person_class| + person_class.prefix = "the_prefix:the_param" + assert_equal "the_prefixthe_param_value", person_class.prefix(:the_param => "the_param_value") + end + end + + def test_set_prefix_with_default_value + SetterTrap.rollback_sets(Person) do |person_class| + person_class.set_prefix + assert_equal "/", person_class.prefix + end + end def test_custom_prefix assert_equal '/people//', StreetAddress.prefix @@ -261,4 +282,9 @@ def test_exists assert !StreetAddress.new({:id => 1}, {:person_id => 2}).exists? assert !StreetAddress.new({:id => 2}, {:person_id => 1}).exists? end + + def test_to_xml + matz = Person.find(1) + assert_equal "\n\n Matz\n 1\n\n", matz.to_xml + end end