From 8e0f918a5443577a4b9ef5f1f5ddcbce9c16f1a6 Mon Sep 17 00:00:00 2001 From: haumlab <222520099+b1ume@users.noreply.github.com> Date: Tue, 4 Aug 2026 00:52:17 +0100 Subject: [PATCH 1/3] --- spec/requests/blocked_users_n_plus_one_spec.rb | 2 +- spec/requests/collection_items_n_plus_one_spec.rb | 2 +- spec/requests/collections_n_plus_one_spec.rb | 2 +- spec/requests/muted_users_n_plus_one_spec.rb | 2 +- spec/requests/people_n_plus_one_spec.rb | 4 ++-- spec/requests/pseuds_n_plus_one_spec.rb | 2 +- spec/requests/readings_n_plus_one_spec.rb | 2 +- spec/requests/skins_n_plus_one_spec.rb | 2 +- spec/requests/works_n_plus_one_spec.rb | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/spec/requests/blocked_users_n_plus_one_spec.rb b/spec/requests/blocked_users_n_plus_one_spec.rb index 363dca89a43..38eb38242c1 100644 --- a/spec/requests/blocked_users_n_plus_one_spec.rb +++ b/spec/requests/blocked_users_n_plus_one_spec.rb @@ -5,7 +5,7 @@ describe "n+1 queries in the blocked users controller" do include LoginMacros - describe "#index", n_plus_one: true do + describe "#index", n_plus_one: true, work_search: true, bookmark_search: true, collection_search: true, pseud_search: true do context "with a logged in user who has blocked someone" do let!(:blocker) { create(:user) } diff --git a/spec/requests/collection_items_n_plus_one_spec.rb b/spec/requests/collection_items_n_plus_one_spec.rb index 925f0ed80be..da7fc47397e 100644 --- a/spec/requests/collection_items_n_plus_one_spec.rb +++ b/spec/requests/collection_items_n_plus_one_spec.rb @@ -5,7 +5,7 @@ describe "n+1 queries in the collection items controller" do include LoginMacros - describe "#index" do + describe "#index", work_search: true, bookmark_search: true, collection_search: true do context "when viewing collection items for a specific user", n_plus_one: true do let!(:user) { create(:user) } diff --git a/spec/requests/collections_n_plus_one_spec.rb b/spec/requests/collections_n_plus_one_spec.rb index e07d93dd4ba..136d531d480 100644 --- a/spec/requests/collections_n_plus_one_spec.rb +++ b/spec/requests/collections_n_plus_one_spec.rb @@ -3,7 +3,7 @@ require "spec_helper" describe "n+1 queries in the collections controller" do - describe "#index", n_plus_one: true do + describe "#index", n_plus_one: true, work_search: true, bookmark_search: true, collection_search: true do populate do |n| CollectionIndexer.prepare_for_testing create_list(:collection, n, challenge: create(:gift_exchange)) diff --git a/spec/requests/muted_users_n_plus_one_spec.rb b/spec/requests/muted_users_n_plus_one_spec.rb index b7ac5826c0f..c9d5c9ef2ac 100644 --- a/spec/requests/muted_users_n_plus_one_spec.rb +++ b/spec/requests/muted_users_n_plus_one_spec.rb @@ -5,7 +5,7 @@ describe "n+1 queries in the muted users controller" do include LoginMacros - describe "#index", n_plus_one: true do + describe "#index", n_plus_one: true, work_search: true, bookmark_search: true, collection_search: true, pseud_search: true do context "with a logged in user who has muted someone" do let!(:muter) { create(:user) } diff --git a/spec/requests/people_n_plus_one_spec.rb b/spec/requests/people_n_plus_one_spec.rb index 675be3eab37..83f5fcce2ec 100644 --- a/spec/requests/people_n_plus_one_spec.rb +++ b/spec/requests/people_n_plus_one_spec.rb @@ -3,7 +3,7 @@ require "spec_helper" describe "n+1 queries in the people controller" do - describe "#index", n_plus_one: true do + describe "#index", n_plus_one: true, work_search: true, bookmark_search: true, collection_search: true, pseud_search: true do context "when viewing people in a collection" do let!(:collection) { create(:collection) } @@ -26,7 +26,7 @@ end end - describe "#search", n_plus_one: true do + describe "#search", n_plus_one: true, pseud_search: true, collection_search: true do context "when there are search results" do populate do |n| PseudIndexer.prepare_for_testing diff --git a/spec/requests/pseuds_n_plus_one_spec.rb b/spec/requests/pseuds_n_plus_one_spec.rb index 8d37a06c4d9..60d7f86dc4c 100644 --- a/spec/requests/pseuds_n_plus_one_spec.rb +++ b/spec/requests/pseuds_n_plus_one_spec.rb @@ -5,7 +5,7 @@ describe "n+1 queries in the user pseuds controller" do include LoginMacros - describe "#index", n_plus_one: true do + describe "#index", n_plus_one: true, work_search: true, bookmark_search: true, collection_search: true, pseud_search: true do let!(:user) { create(:user) } populate do |n| diff --git a/spec/requests/readings_n_plus_one_spec.rb b/spec/requests/readings_n_plus_one_spec.rb index f0f7a2728ea..04a49f79cc9 100644 --- a/spec/requests/readings_n_plus_one_spec.rb +++ b/spec/requests/readings_n_plus_one_spec.rb @@ -3,7 +3,7 @@ describe "n+1 queries in the readings controller" do include LoginMacros - describe "#index", n_plus_one: true do + describe "#index", n_plus_one: true, work_search: true, bookmark_search: true, collection_search: true do context "when displaying a user's reading history" do let!(:user) { create(:user) } diff --git a/spec/requests/skins_n_plus_one_spec.rb b/spec/requests/skins_n_plus_one_spec.rb index 9ce29337ece..e748ec74c2c 100644 --- a/spec/requests/skins_n_plus_one_spec.rb +++ b/spec/requests/skins_n_plus_one_spec.rb @@ -5,7 +5,7 @@ describe "n+1 queries in the skins controller" do include LoginMacros - describe "#index", n_plus_one: true do + describe "#index", n_plus_one: true, work_search: true, bookmark_search: true, collection_search: true do context "when displaying a user's work skins" do let!(:user) { create(:user) } diff --git a/spec/requests/works_n_plus_one_spec.rb b/spec/requests/works_n_plus_one_spec.rb index 43e06d3aaca..e1c345a6135 100644 --- a/spec/requests/works_n_plus_one_spec.rb +++ b/spec/requests/works_n_plus_one_spec.rb @@ -154,7 +154,7 @@ it_behaves_like "displaying multiple works efficiently", queries_per_work: 1 end - describe "#search" do + describe "#search", work_search: true, bookmark_search: true do subject do proc do get search_works_path(work_search: { query: fandom.name }) From eff4fdac144307afa3aadf3d9193f19c2a3d1e72 Mon Sep 17 00:00:00 2001 From: haumlab <222520099+b1ume@users.noreply.github.com> Date: Mon, 10 Aug 2026 06:12:58 +0100 Subject: [PATCH 2/3] AO3-7541 Add search metadata to remaining works request specs --- spec/requests/works_n_plus_one_spec.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/requests/works_n_plus_one_spec.rb b/spec/requests/works_n_plus_one_spec.rb index e1c345a6135..2c39b701b1e 100644 --- a/spec/requests/works_n_plus_one_spec.rb +++ b/spec/requests/works_n_plus_one_spec.rb @@ -50,7 +50,7 @@ end end - describe "#index" do + describe "#index", work_search: true, bookmark_search: true do context "when viewing the works for a tag" do subject do proc do @@ -116,7 +116,7 @@ end end - describe "#collected" do + describe "#collected", work_search: true, bookmark_search: true do subject do proc do get collected_user_works_path(user) @@ -138,7 +138,7 @@ end end - describe "#drafts" do + describe "#drafts", work_search: true, bookmark_search: true do subject do proc do fake_login_known_user(user.reload) From 02a16482054b6c8e55abe7708c1e099ae7455ce0 Mon Sep 17 00:00:00 2001 From: haumlab <222520099+b1ume@users.noreply.github.com> Date: Mon, 10 Aug 2026 07:05:41 +0100 Subject: [PATCH 3/3] AO3-7541 Add search metadata to inbox request specs --- spec/requests/homepage_inbox_n_plus_one_spec.rb | 2 +- spec/requests/inbox_n_plus_one_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/requests/homepage_inbox_n_plus_one_spec.rb b/spec/requests/homepage_inbox_n_plus_one_spec.rb index 8197a9b1853..31d1c25ec63 100644 --- a/spec/requests/homepage_inbox_n_plus_one_spec.rb +++ b/spec/requests/homepage_inbox_n_plus_one_spec.rb @@ -3,7 +3,7 @@ describe "n+1 queries in the inbox module on the homepage: " do include LoginMacros - describe "#show", n_plus_one: true do + describe "#show", n_plus_one: true, work_search: true, bookmark_search: true, collection_search: true do context "displaying a user's unread messages on the homepage" do let!(:user) { create(:user) } diff --git a/spec/requests/inbox_n_plus_one_spec.rb b/spec/requests/inbox_n_plus_one_spec.rb index a5e7696ff41..24fdebcb1df 100644 --- a/spec/requests/inbox_n_plus_one_spec.rb +++ b/spec/requests/inbox_n_plus_one_spec.rb @@ -3,7 +3,7 @@ describe "n+1 queries in the InboxController" do include LoginMacros - describe "#show" do + describe "#show", work_search: true, bookmark_search: true, collection_search: true do let!(:user) { create(:user) } shared_examples "a constant number of queries" do