forked from mirrors/catstodon
Add error classes to api/base errors coverage (#28864)
This commit is contained in:
parent
a34d27c18f
commit
a11a2fb052
1 changed files with 19 additions and 11 deletions
|
@ -12,7 +12,7 @@ describe Api::BaseController do
|
||||||
head 200
|
head 200
|
||||||
end
|
end
|
||||||
|
|
||||||
def error
|
def failure
|
||||||
FakeService.new
|
FakeService.new
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -30,7 +30,7 @@ describe Api::BaseController do
|
||||||
|
|
||||||
it 'does not protect from forgery' do
|
it 'does not protect from forgery' do
|
||||||
ActionController::Base.allow_forgery_protection = true
|
ActionController::Base.allow_forgery_protection = true
|
||||||
post 'success'
|
post :success
|
||||||
expect(response).to have_http_status(200)
|
expect(response).to have_http_status(200)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -50,47 +50,55 @@ describe Api::BaseController do
|
||||||
|
|
||||||
it 'returns http forbidden for unconfirmed accounts' do
|
it 'returns http forbidden for unconfirmed accounts' do
|
||||||
user.update(confirmed_at: nil)
|
user.update(confirmed_at: nil)
|
||||||
post 'success'
|
post :success
|
||||||
expect(response).to have_http_status(403)
|
expect(response).to have_http_status(403)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns http forbidden for pending accounts' do
|
it 'returns http forbidden for pending accounts' do
|
||||||
user.update(approved: false)
|
user.update(approved: false)
|
||||||
post 'success'
|
post :success
|
||||||
expect(response).to have_http_status(403)
|
expect(response).to have_http_status(403)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns http forbidden for disabled accounts' do
|
it 'returns http forbidden for disabled accounts' do
|
||||||
user.update(disabled: true)
|
user.update(disabled: true)
|
||||||
post 'success'
|
post :success
|
||||||
expect(response).to have_http_status(403)
|
expect(response).to have_http_status(403)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns http forbidden for suspended accounts' do
|
it 'returns http forbidden for suspended accounts' do
|
||||||
user.account.suspend!
|
user.account.suspend!
|
||||||
post 'success'
|
post :success
|
||||||
expect(response).to have_http_status(403)
|
expect(response).to have_http_status(403)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'error handling' do
|
describe 'error handling' do
|
||||||
before do
|
before do
|
||||||
routes.draw { get 'error' => 'api/base#error' }
|
routes.draw { get 'failure' => 'api/base#failure' }
|
||||||
end
|
end
|
||||||
|
|
||||||
{
|
{
|
||||||
ActiveRecord::RecordInvalid => 422,
|
ActiveRecord::RecordInvalid => 422,
|
||||||
Mastodon::ValidationError => 422,
|
|
||||||
ActiveRecord::RecordNotFound => 404,
|
ActiveRecord::RecordNotFound => 404,
|
||||||
Mastodon::UnexpectedResponseError => 503,
|
ActiveRecord::RecordNotUnique => 422,
|
||||||
|
Date::Error => 422,
|
||||||
HTTP::Error => 503,
|
HTTP::Error => 503,
|
||||||
OpenSSL::SSL::SSLError => 503,
|
Mastodon::InvalidParameterError => 400,
|
||||||
Mastodon::NotPermittedError => 403,
|
Mastodon::NotPermittedError => 403,
|
||||||
|
Mastodon::RaceConditionError => 503,
|
||||||
|
Mastodon::RateLimitExceededError => 429,
|
||||||
|
Mastodon::UnexpectedResponseError => 503,
|
||||||
|
Mastodon::ValidationError => 422,
|
||||||
|
OpenSSL::SSL::SSLError => 503,
|
||||||
|
Seahorse::Client::NetworkingError => 503,
|
||||||
|
Stoplight::Error::RedLight => 503,
|
||||||
}.each do |error, code|
|
}.each do |error, code|
|
||||||
it "Handles error class of #{error}" do
|
it "Handles error class of #{error}" do
|
||||||
allow(FakeService).to receive(:new).and_raise(error)
|
allow(FakeService).to receive(:new).and_raise(error)
|
||||||
|
|
||||||
get 'error'
|
get :failure
|
||||||
|
|
||||||
expect(response).to have_http_status(code)
|
expect(response).to have_http_status(code)
|
||||||
expect(FakeService).to have_received(:new)
|
expect(FakeService).to have_received(:new)
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue