Skip to content

Commit

Permalink
Fix test failure caused by glitch-soc changes
Browse files Browse the repository at this point in the history
  • Loading branch information
ClearlyClaire committed Dec 19, 2023
1 parent 2e786e1 commit 6c00d5b
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
9 changes: 5 additions & 4 deletions config/initializers/content_security_policy.rb
Original file line number Diff line number Diff line change
Expand Up @@ -60,22 +60,23 @@ def sso_host
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?
p.form_action :self, sso_host
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

Expand Down
4 changes: 2 additions & 2 deletions spec/requests/api/v1/instance_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

expect(body_as_json)
.to be_present
.and include(title: 'Mastodon')
.and include(title: 'Mastodon Glitch Edition')
end
end

Expand All @@ -30,7 +30,7 @@

expect(body_as_json)
.to be_present
.and include(title: 'Mastodon')
.and include(title: 'Mastodon Glitch Edition')
end
end
end
Expand Down
4 changes: 2 additions & 2 deletions spec/requests/api/v2/instance_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

expect(body_as_json)
.to be_present
.and include(title: 'Mastodon')
.and include(title: 'Mastodon Glitch Edition')
end
end

Expand All @@ -30,7 +30,7 @@

expect(body_as_json)
.to be_present
.and include(title: 'Mastodon')
.and include(title: 'Mastodon Glitch Edition')
end
end
end
Expand Down

0 comments on commit 6c00d5b

Please sign in to comment.