treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fix test failure caused by glitch-soc changes

th-new
Claire 2023-12-19 20:59:28 +01:00
parent 2e786e13cb
commit 6c00d5b0c4
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config/initializers/content_security_policy.rb
View File

@ -60,15 +60,11 @@ unless Rails.env.development?
p.base_uri :none
p.default_src :none
p.frame_ancestors :none
p.script_src :self, assets_host, "'wasm-unsafe-eval'"
p.font_src :self, assets_host
p.img_src :self, :data, :blob, *data_hosts
p.style_src :self, assets_host
p.media_src :self, :data, *data_hosts
p.frame_src :self, :https
p.child_src :self, :blob, assets_host
p.worker_src :self, :blob, assets_host
p.connect_src :self, :blob, :data, Rails.configuration.x.streaming_api_base_url, *data_hosts
p.manifest_src :self, assets_host
if sso_host.present?
@ -76,6 +72,11 @@ unless Rails.env.development?
else
p.form_action :self
end
p.child_src :self, :blob, assets_host
p.worker_src :self, :blob, assets_host
p.connect_src :self, :blob, :data, Rails.configuration.x.streaming_api_base_url, *data_hosts
p.script_src :self, assets_host, "'wasm-unsafe-eval'"
end
end

4
spec/requests/api/v1/instance_spec.rb
View File

@ -17,7 +17,7 @@ describe 'Instances' do
expect(body_as_json)
.to be_present
.and include(title: 'Mastodon')
.and include(title: 'Mastodon Glitch Edition')
end
end
@ -30,7 +30,7 @@ describe 'Instances' do
expect(body_as_json)
.to be_present
.and include(title: 'Mastodon')
.and include(title: 'Mastodon Glitch Edition')
end
end
end

4
spec/requests/api/v2/instance_spec.rb
View File

@ -17,7 +17,7 @@ describe 'Instances' do
expect(body_as_json)
.to be_present
.and include(title: 'Mastodon')
.and include(title: 'Mastodon Glitch Edition')
end
end
@ -30,7 +30,7 @@ describe 'Instances' do
expect(body_as_json)
.to be_present
.and include(title: 'Mastodon')
.and include(title: 'Mastodon Glitch Edition')
end
end
end