diff options
| author | beatrix <beatrix.bitrot@gmail.com> | 2017-07-20 11:24:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-20 11:24:32 -0400 |
| commit | e7edb4d1eeba6c12a1c71271faa30d2bbf00d054 (patch) | |
| tree | f373d05c4ea43bd335910f3603fab3d866a2486e /spec/controllers | |
| parent | d2352246920800e491466d84b0146feb4d1d791f (diff) | |
| parent | 1fcdaafa6fbe6d746a096c33263d76e6819da46d (diff) | |
Merge pull request #87 from tootsuite/master
merge upstream
Diffstat (limited to 'spec/controllers')
| -rw-r--r-- | spec/controllers/api/base_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/api/base_controller_spec.rb b/spec/controllers/api/base_controller_spec.rb index 7d5e0116c..0c7ca8990 100644 --- a/spec/controllers/api/base_controller_spec.rb +++ b/spec/controllers/api/base_controller_spec.rb @@ -32,7 +32,7 @@ describe Api::BaseController do ActiveRecord::RecordInvalid => 422, Mastodon::ValidationError => 422, ActiveRecord::RecordNotFound => 404, - Goldfinger::Error => 422, + Mastodon::UnexpectedResponseError => 503, HTTP::Error => 503, OpenSSL::SSL::SSLError => 503, Mastodon::NotPermittedError => 403, |