mock_model(XXX).as_null_object.unknown_method returns self

- Fixes #488.
rspec · Jan 19, 2012 · 7fa15c4 · 7fa15c4 · pisaruk · Feb 3, 2012
1 parent c9b47d6
commit 7fa15c4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,10 @@
+### dev
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.8.1...master)
+
+Bug fixes
+* mock_model(XXX).as_null_object.unknown_method returns self again
+
 ### 2.8.1 / 2012-01-04
 
 [full changelog](http://github.com/rspec/rspec-rails/compare/v2.8.0...v2.8.1)

diff --git a/lib/rspec/rails/mocks.rb b/lib/rspec/rails/mocks.rb
@@ -132,7 +132,7 @@ def @object.respond_to?(method_name, include_private=false)
             end unless #{stubs.has_key?(:respond_to?)}
             
             def @object.method_missing(m, *a, &b)
-              respond_to?(m) ? nil : super
+              respond_to?(m) ? null_object? ? self : nil : super
             end
 
             def @object.class

diff --git a/spec/rspec/rails/mocks/mock_model_spec.rb b/spec/rspec/rails/mocks/mock_model_spec.rb
@@ -234,6 +234,11 @@
         it "says it will not respond_to?(xxx_before_type_cast)" do
           @model.as_null_object.respond_to?("title_before_type_cast").should be(false)
         end
+        it "returns self for any unprepared message" do
+          @model.as_null_object.tap do |x|
+            x.non_existant_message.should be(@model)
+          end
+        end
       end
     end