Merge branch 'develop'

1 files changed, 19 insertions, 4 deletions

diff --git a/core/lib/extensions/testing.rb b/core/lib/extensions/testing.rb
index 14a5698..925c023 100644
--- a/core/lib/extensions/testing.rb
+++ b/core/lib/extensions/testing.rb
@@ -1,17 +1,32 @@
 module LeapWebCore
   module AssertResponses
 
+    # response that works with different TestCases:
+    # ActionController::TestCase has @response
+    # ActionDispatch::IntegrationTest has @response
+    # Rack::Test::Methods defines last_response
+    def get_response
+      @response || last_response
+    end
+
     def assert_attachement_filename(name)
       assert_equal %Q(attachment; filename="#{name}"),
-        @response.headers["Content-Disposition"]
+        get_response.headers["Content-Disposition"]
     end
 
-
     def assert_json_response(object)
-      object.stringify_keys! if object.respond_to? :stringify_keys!
-      assert_equal object, JSON.parse(@response.body)
+      if object.is_a? Hash
+        object.stringify_keys! if object.respond_to? :stringify_keys!
+        assert_equal object, JSON.parse(get_response.body)
+      else
+        assert_equal object.to_json, get_response.body
+      end
     end
 
+    def assert_json_error(object)
+      object.stringify_keys! if object.respond_to? :stringify_keys!
+      assert_json_response :errors => object
+    end
   end
 end