From 758b9a3c30a73fd985943fb7a887f0373be3a833 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Sat, 8 Feb 2014 12:29:08 +0100
Subject: split up and expand account integration test

---
 core/lib/extensions/testing.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'core/lib/extensions/testing.rb')

diff --git a/core/lib/extensions/testing.rb b/core/lib/extensions/testing.rb
index aad7fc1..d9b6da8 100644
--- a/core/lib/extensions/testing.rb
+++ b/core/lib/extensions/testing.rb
@@ -22,6 +22,8 @@ module LeapWebCore
     end
 
     def assert_json_response(object)
+      assert_equal 'application/json',
+        get_response.content_type.split(';').first
       if object.is_a? Hash
         object.stringify_keys! if object.respond_to? :stringify_keys!
         assert_equal object, json_response
-- 
cgit v1.2.3


From b4719619aabbe9ebf74563b62e1eb8e4fb248c21 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Mon, 10 Feb 2014 15:01:11 +0100
Subject: ensure we are working on a string as the content type

---
 core/lib/extensions/testing.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/lib/extensions/testing.rb')

diff --git a/core/lib/extensions/testing.rb b/core/lib/extensions/testing.rb
index d9b6da8..8f7e73c 100644
--- a/core/lib/extensions/testing.rb
+++ b/core/lib/extensions/testing.rb
@@ -23,7 +23,7 @@ module LeapWebCore
 
     def assert_json_response(object)
       assert_equal 'application/json',
-        get_response.content_type.split(';').first
+        get_response.content_type.to_s.split(';').first
       if object.is_a? Hash
         object.stringify_keys! if object.respond_to? :stringify_keys!
         assert_equal object, json_response
-- 
cgit v1.2.3


From 53808b073f539ba2b442738b6abf97228488e311 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Tue, 8 Apr 2014 09:12:37 +0200
Subject: moving all of core into toplevel, tests fail.

---
 core/lib/extensions/testing.rb | 48 ------------------------------------------
 1 file changed, 48 deletions(-)
 delete mode 100644 core/lib/extensions/testing.rb

(limited to 'core/lib/extensions/testing.rb')

diff --git a/core/lib/extensions/testing.rb b/core/lib/extensions/testing.rb
deleted file mode 100644
index 8f7e73c..0000000
--- a/core/lib/extensions/testing.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-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}"),
-        get_response.headers["Content-Disposition"]
-    end
-
-    def json_response
-      response = JSON.parse(get_response.body)
-      response.respond_to?(:with_indifferent_access) ?
-        response.with_indifferent_access :
-        response
-    end
-
-    def assert_json_response(object)
-      assert_equal 'application/json',
-        get_response.content_type.to_s.split(';').first
-      if object.is_a? Hash
-        object.stringify_keys! if object.respond_to? :stringify_keys!
-        assert_equal object, json_response
-      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
-
-class ::ActionController::TestCase
-  include LeapWebCore::AssertResponses
-end
-
-class ::ActionDispatch::IntegrationTest
-  include LeapWebCore::AssertResponses
-end
-- 
cgit v1.2.3