fix requiring core extensions - most tests pass

some message tests are failing for me right now.

3 files changed, 50 insertions, 1 deletions

diff --git a/test/support/assert_responses.rb b/test/support/assert_responses.rb
new file mode 100644
index 0000000..b01166f
--- /dev/null
+++ b/test/support/assert_responses.rb
@@ -0,0 +1,46 @@
+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
+
+class ::ActionController::TestCase
+  include AssertResponses
+end
+
+class ::ActionDispatch::IntegrationTest
+  include AssertResponses
+end
diff --git a/test/support/rack_test.rb b/test/support/rack_test.rb
index 2d8e5c4..35d191b 100644
--- a/test/support/rack_test.rb
+++ b/test/support/rack_test.rb
@@ -1,7 +1,7 @@
 class RackTest < ActiveSupport::TestCase
   include Rack::Test::Methods
   include Warden::Test::Helpers
-  include LeapWebCore::AssertResponses
+  include AssertResponses
 
   CONFIG_RU = (Rails.root + 'config.ru').to_s
   OUTER_APP = Rack::Builder.parse_file(CONFIG_RU).first
diff --git a/test/test_helper.rb b/test/test_helper.rb
index f63591f..b844b90 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -4,6 +4,9 @@ require 'rails/test_help'
 
 require 'mocha/setup'
 
+# Load support files from toplevel
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+
 # Load support files from all engines
 Dir["#{File.dirname(__FILE__)}/../*/test/support/**/*.rb"].each { |f| require f }