summaryrefslogtreecommitdiff
path: root/test/integration
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2014-07-10 12:13:30 +0200
committerAzul <azul@leap.se>2014-07-14 10:49:39 +0200
commit60052d15ca02b1c40ed265bed6515880d2851b8f (patch)
treee6946d2c25a04161c4f3003b1ef66ab9376938f4 /test/integration
parent091793265e23452890c6ca27fc64feb54df2ad0b (diff)
clean up and simplify error responses and test code
Diffstat (limited to 'test/integration')
-rw-r--r--test/integration/api/cert_test.rb2
-rw-r--r--test/integration/api/login_test.rb2
-rw-r--r--test/integration/api/smtp_cert_test.rb2
-rw-r--r--test/integration/api/update_account_test.rb2
4 files changed, 4 insertions, 4 deletions
diff --git a/test/integration/api/cert_test.rb b/test/integration/api/cert_test.rb
index 74d439a..118fb9f 100644
--- a/test/integration/api/cert_test.rb
+++ b/test/integration/api/cert_test.rb
@@ -14,7 +14,7 @@ class CertTest < ApiIntegrationTest
test "fetching certs requires login by default" do
get '/1/cert', {}, RACK_ENV
- assert_json_response error: I18n.t(:not_authorized)
+ assert_login_required
end
test "retrieve anonymous eip cert" do
diff --git a/test/integration/api/login_test.rb b/test/integration/api/login_test.rb
index 92d153f..f37639e 100644
--- a/test/integration/api/login_test.rb
+++ b/test/integration/api/login_test.rb
@@ -45,6 +45,6 @@ class LoginTest < SrpTest
test "logout requires token" do
authenticate
logout(nil, {})
- assert_equal 422, last_response.status
+ assert_login_required
end
end
diff --git a/test/integration/api/smtp_cert_test.rb b/test/integration/api/smtp_cert_test.rb
index 7697e44..aee52cf 100644
--- a/test/integration/api/smtp_cert_test.rb
+++ b/test/integration/api/smtp_cert_test.rb
@@ -48,7 +48,7 @@ class SmtpCertTest < ApiIntegrationTest
test "no anonymous smtp certs" do
with_config allow_anonymous_certs: true do
post '/1/smtp_cert', {}, RACK_ENV
- assert_json_response error: I18n.t(:not_authorized)
+ assert_login_required
end
end
end
diff --git a/test/integration/api/update_account_test.rb b/test/integration/api/update_account_test.rb
index 63429e7..16bbb8c 100644
--- a/test/integration/api/update_account_test.rb
+++ b/test/integration/api/update_account_test.rb
@@ -16,7 +16,7 @@ class UpdateAccountTest < SrpTest
authenticate
put "http://api.lvh.me:3000/1/users/" + @user.id + '.json',
user_params(password: "No! Verify me instead.")
- assert_access_denied
+ assert_login_required
end
test "update password via api" do