From 25baa364dea8ffeaa05a76b31d4019dd8e986a2c Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 11 Jul 2024 15:41:39 -0400
Subject: [PATCH] Simplify matcher

---
 .../account_controller_concern_spec.rb        |  4 +--
 spec/requests/accounts_spec.rb                |  2 +-
 spec/requests/link_headers_spec.rb            |  4 +--
 spec/support/matchers/api_pagination.rb       |  2 +-
 spec/support/matchers/http_link_header.rb     | 25 +++++++------------
 5 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/spec/controllers/concerns/account_controller_concern_spec.rb b/spec/controllers/concerns/account_controller_concern_spec.rb
index a6e8d162a6b..e8e81f6b74f 100644
--- a/spec/controllers/concerns/account_controller_concern_spec.rb
+++ b/spec/controllers/concerns/account_controller_concern_spec.rb
@@ -57,8 +57,8 @@ describe AccountControllerConcern do
       expect(assigns(:account)).to eq account
       expect(response)
         .to have_http_status(200)
-        .and have_http_link_header(:lrdd, 'http://test.host/.well-known/webfinger?resource=acct%3Ausername%40cb6e6126.ngrok.io').with_type('application/jrd+json')
-        .and have_http_link_header(:alternate, 'https://cb6e6126.ngrok.io/users/username').with_type('application/activity+json')
+        .and have_http_link_header('http://test.host/.well-known/webfinger?resource=acct%3Ausername%40cb6e6126.ngrok.io', rel: 'lrdd', type: 'application/jrd+json')
+        .and have_http_link_header('https://cb6e6126.ngrok.io/users/username', rel: 'alternate', type: 'application/activity+json')
     end
   end
 end
diff --git a/spec/requests/accounts_spec.rb b/spec/requests/accounts_spec.rb
index 31d913ee91c..f734e21f738 100644
--- a/spec/requests/accounts_spec.rb
+++ b/spec/requests/accounts_spec.rb
@@ -69,7 +69,7 @@ describe 'Accounts show response' do
             expect(response)
               .to have_http_status(200)
               .and render_template(:show)
-              .and have_http_link_header(:alternate, ActivityPub::TagManager.instance.uri_for(account))
+              .and have_http_link_header(ActivityPub::TagManager.instance.uri_for(account), rel: 'alternate')
           end
         end
 
diff --git a/spec/requests/link_headers_spec.rb b/spec/requests/link_headers_spec.rb
index 304955e9e08..b8b5890a1de 100644
--- a/spec/requests/link_headers_spec.rb
+++ b/spec/requests/link_headers_spec.rb
@@ -10,8 +10,8 @@ describe 'Link headers' do
       get short_account_path(username: account)
 
       expect(response)
-        .to have_http_link_header(:lrdd, 'http://www.example.com/.well-known/webfinger?resource=acct%3Atest%40cb6e6126.ngrok.io').with_type('application/jrd+json')
-        .and have_http_link_header(:alternate, 'https://cb6e6126.ngrok.io/users/test').with_type('application/activity+json')
+        .to have_http_link_header('http://www.example.com/.well-known/webfinger?resource=acct%3Atest%40cb6e6126.ngrok.io', rel: 'lrdd', type: 'application/jrd+json')
+        .and have_http_link_header('https://cb6e6126.ngrok.io/users/test', rel: 'alternate', type: 'application/activity+json')
     end
   end
 end
diff --git a/spec/support/matchers/api_pagination.rb b/spec/support/matchers/api_pagination.rb
index 10d3d0b835c..4fc508db340 100644
--- a/spec/support/matchers/api_pagination.rb
+++ b/spec/support/matchers/api_pagination.rb
@@ -3,7 +3,7 @@
 RSpec::Matchers.define :include_pagination_headers do |links|
   match do |response|
     links.map do |key, value|
-      expect(response).to have_http_link_header(key, value)
+      expect(response).to have_http_link_header(value, rel: key.to_s)
     end.all?
   end
 
diff --git a/spec/support/matchers/http_link_header.rb b/spec/support/matchers/http_link_header.rb
index 0676c8e08a4..b48f38a7cd0 100644
--- a/spec/support/matchers/http_link_header.rb
+++ b/spec/support/matchers/http_link_header.rb
@@ -1,15 +1,8 @@
 # frozen_string_literal: true
 
-RSpec::Matchers.define :have_http_link_header do |rel, href|
-  chain :with_type do |type|
-    @type = type
-  end
-
+RSpec::Matchers.define :have_http_link_header do |href, **attrs|
   match do |response|
-    header_link = link_for(response, rel)
-
-    header_link.href == href &&
-      (@type.nil? || header_link.attrs['type'] == @type)
+    link_for(response, attrs)&.href == href
   end
 
   match_when_negated do |response|
@@ -17,17 +10,17 @@ RSpec::Matchers.define :have_http_link_header do |rel, href|
   end
 
   failure_message do |response|
-    (+'').tap do |string|
-      string << "Expected `#{response.headers['Link']}` to include `href` value of `#{href}` "
-      string << "with `type` of `#{@type}` " if @type.present?
-      string << "for `rel=#{rel}` but it did not."
-    end
+    "Expected `#{response.headers['Link']}` to include `href` value of `#{href}` for `#{attrs}` but it did not."
   end
 
-  def link_for(response, rel)
+  failure_message_when_negated do
+    "Expected response not to have a `Link` header but `#{response.headers['Link']}` is present."
+  end
+
+  def link_for(response, attrs)
     LinkHeader
       .parse(response.headers['Link'])
-      .find_link(['rel', rel.to_s])
+      .find_link(*attrs.stringify_keys)
   end
 end