From d791bca11b69f0599a000c8568885dc2ee14ef06 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 11:36:21 -0500
Subject: [PATCH] Combine double subject in `well_known/webfinger` shared
 example (#28944)

---
 spec/requests/well_known/webfinger_spec.rb | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/spec/requests/well_known/webfinger_spec.rb b/spec/requests/well_known/webfinger_spec.rb
index 779f1bba59..0aafdf5624 100644
--- a/spec/requests/well_known/webfinger_spec.rb
+++ b/spec/requests/well_known/webfinger_spec.rb
@@ -17,22 +17,18 @@ describe 'The /.well-known/webfinger endpoint' do
   end
 
   shared_examples 'a successful response' do
-    it 'returns http success' do
+    it 'returns http success with correct media type and headers and body json' do
       expect(response).to have_http_status(200)
-    end
 
-    it 'sets only a Vary Origin header' do
       expect(response.headers['Vary']).to eq('Origin')
-    end
 
-    it 'returns application/jrd+json' do
       expect(response.media_type).to eq 'application/jrd+json'
-    end
 
-    it 'returns links for the account' do
-      json = body_as_json
-      expect(json[:subject]).to eq 'acct:alice@cb6e6126.ngrok.io'
-      expect(json[:aliases]).to include('https://cb6e6126.ngrok.io/@alice', 'https://cb6e6126.ngrok.io/users/alice')
+      expect(body_as_json)
+        .to include(
+          subject: eq('acct:alice@cb6e6126.ngrok.io'),
+          aliases: include('https://cb6e6126.ngrok.io/@alice', 'https://cb6e6126.ngrok.io/users/alice')
+        )
     end
   end