diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-03-17 10:09:55 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-17 10:09:55 +0100 |
commit | 43eff898a0b0f31aaf042d9d387aaece2627a01d (patch) | |
tree | 2cfb9f959ffb96d6c964f8249e14dac6d50a39f5 /spec/controllers/well_known/keybase_proof_config_controller_spec.rb | |
parent | 9cb6bc56faab374c1c740c7093d5271d37201aed (diff) |
Prepare Mastodon for Rails 6 (#15911)
* Fix misuse of foreign_type * Fix use of removed "add_template_helper" * Use response.media_type instead of response.content_type in tests * Fix CSV export controller test on Rails 6 Rails 6 sets a "filename*" field in the Content-Disposition header to explicitly encode the filename as UTF-8. This changes checks the first part of the Content-Disposition header so it matches in both Rails 5 and Rails 6. * Fix emoji formatting with Rails 6 * Make emoji output more idiomatic and robust * Switch from redis-rails gem to built-in Rails redis cache storage
Diffstat (limited to 'spec/controllers/well_known/keybase_proof_config_controller_spec.rb')
-rw-r--r-- | spec/controllers/well_known/keybase_proof_config_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/well_known/keybase_proof_config_controller_spec.rb b/spec/controllers/well_known/keybase_proof_config_controller_spec.rb index 9067e676d..00f251c3c 100644 --- a/spec/controllers/well_known/keybase_proof_config_controller_spec.rb +++ b/spec/controllers/well_known/keybase_proof_config_controller_spec.rb @@ -8,7 +8,7 @@ describe WellKnown::KeybaseProofConfigController, type: :controller do get :show expect(response).to have_http_status(200) - expect(response.content_type).to eq 'application/json' + expect(response.media_type).to eq 'application/json' expect { JSON.parse(response.body) }.not_to raise_exception end end |