Merge pull request opf#15674 from opf/simpler-tests-queries

Use shared_let and explicitly set user for `public_query`

spec/models/queries/projects/project_query_spec.rb

@@ -389,35 +389,30 @@
   end
 
   describe "scopes" do
+    shared_let(:public_query) { create(:project_query, user:, public: true) }
+    shared_let(:public_query_other_user) { create(:project_query, public: true) }
+    shared_let(:private_query) { create(:project_query, user:) }
+    shared_let(:private_query_other_user) { create(:project_query) }
+
     describe ".public_lists" do
       it "returns only public lists" do
-        public_query = create(:project_query, public: true)
-        public_query_other_user = create(:project_query, public: true)
-        create(:project_query, public: false)
-
         expect(described_class.public_lists).to contain_exactly(public_query, public_query_other_user)
       end
     end
 
     describe ".private_lists" do
       it "returns only private lists owned by the user" do
-        create(:project_query, public: true)
-        private_query = create(:project_query, public: false)
-        create(:project_query, public: false)
-
-        expect(described_class.private_lists(user: private_query.user)).to contain_exactly(private_query)
+        expect(described_class.private_lists(user:)).to contain_exactly(private_query)
       end
     end
 
     describe ".visible" do
       it "returns public and private queries owned by the user" do
-        public_query = create(:project_query, public: true)
-        public_query_other_user = create(:project_query, public: true)
-        private_query = create(:project_query, public: false)
-        create(:project_query, public: false)
-
-        expect(described_class.visible(private_query.user)).to contain_exactly(public_query, public_query_other_user,
-                                                                               private_query)
+        expect(described_class.visible(user)).to contain_exactly(
+          public_query,
+          public_query_other_user,
+          private_query
+        )
       end
     end
   end