monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove `CacheBuster` default options (#30718)

This commit is contained in:
Matt Jankowski 2024-06-21 11:32:49 -04:00 committed by GitHub
parent 4651c0cb39
commit 72484a194f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/lib/cache_buster.rb
View File

@ -2,13 +2,8 @@
class CacheBuster class CacheBuster
def initialize(options = {}) def initialize(options = {})
Rails.application.deprecators[:mastodon].warn('Default values for the cache buster secret header name and values will be removed in Mastodon 4.3. Please set them explicitely if you rely on those.') unless options[:http_method] || (options[:secret] && options[:secret_header]) @secret_header = options[:secret_header]
@secret = options[:secret]
@secret_header = options[:secret_header] ||
(options[:http_method] ? nil : 'Secret-Header')
@secret = options[:secret] ||
(options[:http_method] ? nil : 'True')
@http_method = options[:http_method] || 'GET' @http_method = options[:http_method] || 'GET'
end end

8
spec/lib/cache_buster_spec.rb
View File

@ -28,14 +28,6 @@ describe CacheBuster do
end end
context 'when using default options' do context 'when using default options' do
around do |example|
# Disables the CacheBuster.new deprecation warning about default arguments.
# Remove this `silence` block when default arg support is removed from CacheBuster
Rails.application.deprecators[:mastodon].silence do
example.run
end
end
include_examples 'makes_request' include_examples 'makes_request'
end end