Remove body_as_json in favor of built-in response.parsed_body for JSON response specs (#31749)

This commit is contained in:
Matt Jankowski 2024-09-06 05:58:46 -04:00 committed by GitHub
parent be77a1098b
commit 6b6a80b407
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
107 changed files with 422 additions and 413 deletions

View file

@ -24,7 +24,7 @@ RSpec.describe 'The /.well-known/webfinger endpoint' do
expect(response.media_type).to eq 'application/jrd+json'
expect(body_as_json)
expect(response.parsed_body)
.to include(
subject: eq('acct:alice@cb6e6126.ngrok.io'),
aliases: include('https://cb6e6126.ngrok.io/@alice', 'https://cb6e6126.ngrok.io/users/alice')
@ -129,7 +129,7 @@ RSpec.describe 'The /.well-known/webfinger endpoint' do
end
it 'returns links for the internal account' do
expect(body_as_json)
expect(response.parsed_body)
.to include(
subject: 'acct:mastodon.internal@cb6e6126.ngrok.io',
aliases: ['https://cb6e6126.ngrok.io/actor']
@ -168,7 +168,7 @@ RSpec.describe 'The /.well-known/webfinger endpoint' do
it 'returns avatar in response' do
perform_request!
avatar_link = get_avatar_link(body_as_json)
avatar_link = get_avatar_link(response.parsed_body)
expect(avatar_link).to_not be_nil
expect(avatar_link[:type]).to eq alice.avatar.content_type
expect(avatar_link[:href]).to eq Addressable::URI.new(host: Rails.configuration.x.local_domain, path: alice.avatar.to_s, scheme: 'https').to_s
@ -182,7 +182,7 @@ RSpec.describe 'The /.well-known/webfinger endpoint' do
it 'does not return avatar in response' do
perform_request!
avatar_link = get_avatar_link(body_as_json)
avatar_link = get_avatar_link(response.parsed_body)
expect(avatar_link).to be_nil
end
end
@ -197,7 +197,7 @@ RSpec.describe 'The /.well-known/webfinger endpoint' do
it 'does not return avatar in response' do
perform_request!
avatar_link = get_avatar_link(body_as_json)
avatar_link = get_avatar_link(response.parsed_body)
expect(avatar_link).to be_nil
end
end
@ -212,7 +212,7 @@ RSpec.describe 'The /.well-known/webfinger endpoint' do
end
it 'does not return avatar in response' do
avatar_link = get_avatar_link(body_as_json)
avatar_link = get_avatar_link(response.parsed_body)
expect(avatar_link).to be_nil
end
end