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
This commit is contained in:
		
					parent
					
						
							
								9cb6bc56fa
							
						
					
				
			
			
				commit
				
					
						43eff898a0
					
				
			
		
					 23 changed files with 45 additions and 61 deletions
				
			
		|  | @ -73,7 +73,7 @@ RSpec.describe ActivityPub::RepliesController, type: :controller do | |||
|         end | ||||
| 
 | ||||
|         it 'returns application/activity+json' do | ||||
|           expect(response.content_type).to eq 'application/activity+json' | ||||
|           expect(response.media_type).to eq 'application/activity+json' | ||||
|         end | ||||
| 
 | ||||
|         it_behaves_like 'cachable response' | ||||
|  | @ -120,7 +120,7 @@ RSpec.describe ActivityPub::RepliesController, type: :controller do | |||
|           end | ||||
| 
 | ||||
|           it 'returns application/activity+json' do | ||||
|             expect(response.content_type).to eq 'application/activity+json' | ||||
|             expect(response.media_type).to eq 'application/activity+json' | ||||
|           end | ||||
| 
 | ||||
|           it_behaves_like 'cachable response' | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue