From 2dc09d3c31851e0c0ba77d96ac7a8ad65e6b4d25 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Thu, 14 Mar 2024 09:52:16 -0400 Subject: [PATCH] Use actual messages --- .../concerns/api/error_handling_spec.rb | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/spec/controllers/concerns/api/error_handling_spec.rb b/spec/controllers/concerns/api/error_handling_spec.rb index 102891d2ee..b8bf6b3dd0 100644 --- a/spec/controllers/concerns/api/error_handling_spec.rb +++ b/spec/controllers/concerns/api/error_handling_spec.rb @@ -19,20 +19,20 @@ describe Api::ErrorHandling do end { - ActiveRecord::RecordInvalid => { code: 422, message: // }, - ActiveRecord::RecordNotFound => { code: 404, message: // }, - ActiveRecord::RecordNotUnique => { code: 422, message: // }, - Date::Error => { code: 422, message: // }, - HTTP::Error => { code: 503, message: // }, + ActiveRecord::RecordInvalid => { code: 422, message: /invalid/i }, + ActiveRecord::RecordNotFound => { code: 404, message: /record not found/i }, + ActiveRecord::RecordNotUnique => { code: 422, message: /duplicate record/i }, + Date::Error => { code: 422, message: /invalid date/i }, + HTTP::Error => { code: 503, message: /remote data could not/i }, Mastodon::InvalidParameterError => { code: 400, message: // }, - Mastodon::NotPermittedError => { code: 403, message: // }, - Mastodon::RaceConditionError => { code: 503, message: // }, - Mastodon::RateLimitExceededError => { code: 429, message: // }, - Mastodon::UnexpectedResponseError => { code: 503, message: // }, - Mastodon::ValidationError => { code: 422, message: // }, - OpenSSL::SSL::SSLError => { code: 503, message: // }, - Seahorse::Client::NetworkingError => { code: 503, message: // }, - Stoplight::Error::RedLight => { code: 503, message: // }, + Mastodon::NotPermittedError => { code: 403, message: /action is not allowed/i }, + Mastodon::RaceConditionError => { code: 503, message: /temporary problem serving/i }, + Mastodon::RateLimitExceededError => { code: 429, message: /too many requests/i }, + Mastodon::UnexpectedResponseError => { code: 503, message: /remote data could not/i }, + Mastodon::ValidationError => { code: 422, message: /validation/i }, + OpenSSL::SSL::SSLError => { code: 503, message: /ssl certificate could not/i }, + Seahorse::Client::NetworkingError => { code: 503, message: /temporary problem serving/i }, + Stoplight::Error::RedLight => { code: 503, message: /temporary problem serving/i }, }.each do |error, options| it "Handles error class of #{error}" do allow(FakeService)