chinwag/chinwagsocial
chinwag/chinwagsocial
2
0
Fork 0
Code Issues Pull requests Releases 14 Wiki Activity

Prepare Mastodon for Rails 6 (#15911)

Browse source 
* 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
This commit is contained in:
Claire 2021-03-17 10:09:55 +01:00 • committed by GitHub
commit 43eff898a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 45 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

6
spec/requests/webfinger_request_spec.rb
View file

@ -8,7 +8,7 @@ describe 'The webfinger route' do
get webfinger_url(resource: alice.to_webfinger_s)
expect(response).to have_http_status(200)
expect(response.content_type).to eq 'application/jrd+json'
expect(response.media_type).to eq 'application/jrd+json'
end
end
@ -17,7 +17,7 @@ describe 'The webfinger route' do
get webfinger_url(resource: alice.to_webfinger_s, format: :json)
expect(response).to have_http_status(200)
expect(response.content_type).to eq 'application/jrd+json'
expect(response.media_type).to eq 'application/jrd+json'
end
it 'returns a json response for json accept header' do
@ -25,7 +25,7 @@ describe 'The webfinger route' do
get webfinger_url(resource: alice.to_webfinger_s), headers: headers
expect(response).to have_http_status(200)
expect(response.content_type).to eq 'application/jrd+json'
expect(response.media_type).to eq 'application/jrd+json'
end
end
end