Merge remote-tracking branch 'origin/develop'

We'll only use the master branch for development from now on.

1 files changed, 8 insertions, 5 deletions

diff --git a/test/support/assert_responses.rb b/test/support/assert_responses.rb
index 7724fb4..6a22642 100644
--- a/test/support/assert_responses.rb
+++ b/test/support/assert_responses.rb
@@ -71,21 +71,24 @@ module AssertResponses
   end
 
   def assert_login_required
-    assert_error_response :not_authorized_login, :unauthorized
+    assert_error_response :not_authorized_login,
+      status: :unauthorized
   end
 
   def assert_access_denied
-    assert_error_response :not_authorized, :forbidden
+    assert_error_response :not_authorized,
+      status: :forbidden
   end
 
-  def assert_error_response(key, status=nil)
-    message = I18n.t(key)
+  def assert_error_response(key, options = {})
+    status=options.delete :status
+    message = I18n.t(key, options)
     if content_type == 'application/json'
       status ||= :unprocessable_entity
       assert_json_response('error' => key.to_s, 'message' => message)
       assert_response status
     else
-      assert_equal({:alert => message}, flash.to_hash)
+      assert_equal({'alert' => message}, flash.to_hash)
     end
   end