summaryrefslogtreecommitdiff
path: root/test/support
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2014-07-14 17:26:28 +0200
committerAzul <azul@leap.se>2014-07-17 12:47:47 +0200
commit150c80bfc7c469b23f7ac1bac0e42014ad417df6 (patch)
tree8fa65f4601e82a86b07d48ba9727945bcb4b9ff3 /test/support
parentb17387a17669bfc9afce7435653cd8c29c686999 (diff)
add translation and fix tests
Diffstat (limited to 'test/support')
-rw-r--r--test/support/assert_responses.rb19
1 files changed, 17 insertions, 2 deletions
diff --git a/test/support/assert_responses.rb b/test/support/assert_responses.rb
index 1c9d49d..7724fb4 100644
--- a/test/support/assert_responses.rb
+++ b/test/support/assert_responses.rb
@@ -20,6 +20,22 @@ module AssertResponses
response
end
+ def response_content
+ json_response || get_response.body
+ end
+
+ def assert_success(message)
+ assert_response :success
+ assert_response_includes :success
+ assert_equal message.to_s, json_response[:success] if message.present?
+ end
+
+ def assert_not_found
+ assert_response :not_found
+ assert_response_includes :error
+ assert_equal 'not_found', json_response[:error]
+ end
+
def assert_text_response(body = nil)
assert_equal 'text/plain', content_type
unless body.nil?
@@ -45,8 +61,7 @@ module AssertResponses
# checks for the presence of a key in a json response
# or a string in a text response
def assert_response_includes(string_or_key)
- response = json_response || get_response.body
- assert response.include?(string_or_key),
+ assert response_content.include?(string_or_key),
"response should have included #{string_or_key}"
end