Merge remote-tracking branch 'parent/main' into upstream-20240906

spec/requests/api/v1/timelines/home_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Home', :inline_jobs do
+RSpec.describe 'Home', :inline_jobs do
   let(:user)    { Fabricate(:user) }
   let(:scopes)  { 'read:statuses' }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
@@ -94,8 +94,9 @@ describe 'Home', :inline_jobs do
       it 'returns http unprocessable entity', :aggregate_failures do
         subject
 
-        expect(response).to have_http_status(422)
-        expect(response.headers['Link']).to be_nil
+        expect(response)
+          .to have_http_status(422)
+          .and not_have_http_link_header
       end
     end
   end

spec/requests/api/v1/timelines/link_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Link' do
+RSpec.describe 'Link' do
   let(:user)    { Fabricate(:user) }
   let(:scopes)  { 'read:statuses' }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }

spec/requests/api/v1/timelines/list_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'API V1 Timelines List' do
+RSpec.describe 'API V1 Timelines List' do
   let(:user) { Fabricate(:user) }
   let(:scopes)  { 'read:statuses' }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
@@ -47,8 +47,9 @@ describe 'API V1 Timelines List' do
       it 'returns http unprocessable entity' do
         get "/api/v1/timelines/list/#{list.id}", headers: headers
 
-        expect(response).to have_http_status(422)
-        expect(response.headers['Link']).to be_nil
+        expect(response)
+          .to have_http_status(422)
+          .and not_have_http_link_header
       end
     end
   end

spec/requests/api/v1/timelines/public_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Public' do
+RSpec.describe 'Public' do
   let(:user)    { Fabricate(:user) }
   let(:scopes)  { 'read:statuses' }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }

spec/requests/api/v1/timelines/tag_spec.rb

@@ -8,22 +8,25 @@ RSpec.describe 'Tag' do
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
-  shared_examples 'a successful request to the tag timeline' do
-    it 'returns the expected statuses', :aggregate_failures do
-      subject
-
-      expect(response).to have_http_status(200)
-      expect(body_as_json.pluck(:id)).to match_array(expected_statuses.map { |status| status.id.to_s })
-    end
-  end
-
   describe 'GET /api/v1/timelines/tag/:hashtag' do
     subject do
       get "/api/v1/timelines/tag/#{hashtag}", headers: headers, params: params
     end
 
+    shared_examples 'a successful request to the tag timeline' do
+      it 'returns the expected statuses', :aggregate_failures do
+        subject
+
+        expect(response)
+          .to have_http_status(200)
+        expect(body_as_json.pluck(:id))
+          .to match_array(expected_statuses.map { |status| status.id.to_s })
+          .and not_include(private_status.id)
+      end
+    end
+
     let(:account)         { Fabricate(:account) }
-    let!(:private_status) { PostStatusService.new.call(account, visibility: :private, text: '#life could be a dream') } # rubocop:disable RSpec/LetSetup
+    let!(:private_status) { PostStatusService.new.call(account, visibility: :private, text: '#life could be a dream') }
     let!(:life_status)    { PostStatusService.new.call(account, text: 'tell me what is my #life without your #love') }
     let!(:war_status)     { PostStatusService.new.call(user.account, text: '#war, war never changes') }
     let!(:love_status)    { PostStatusService.new.call(account, text: 'what is #love?') }