Merge branch '321017-optimize-factory-usage' into 'master'

Optimize factory usage in search specs

See merge request gitlab-org/gitlab!53836

ee/spec/lib/gitlab/elastic/search_results_spec.rb

@@ -300,23 +300,24 @@ RSpec.describe Gitlab::Elastic::SearchResults, :elastic, :sidekiq_might_not_need
     end
 
     context 'ordering' do
-      let!(:project) { create(:project, :public) }
+      let_it_be(:project) { create(:project, :public) }
 
       let!(:old_result) { create(:issue, project: project, title: 'sorted old', created_at: 1.month.ago) }
       let!(:new_result) { create(:issue, project: project, title: 'sorted recent', created_at: 1.day.ago) }
       let!(:very_old_result) { create(:issue, project: project, title: 'sorted very old', created_at: 1.year.ago) }
-      let(:results_created) { described_class.new(user, 'sorted', [project.id], sort: sort) }
 
       let!(:old_updated) { create(:issue, project: project, title: 'updated old', updated_at: 1.month.ago) }
       let!(:new_updated) { create(:issue, project: project, title: 'updated recent', updated_at: 1.day.ago) }
       let!(:very_old_updated) { create(:issue, project: project, title: 'updated very old', updated_at: 1.year.ago) }
-      let(:results_updated) { described_class.new(user, 'updated', [project.id], sort: sort) }
 
       before do
         ensure_elasticsearch_index!
       end
 
-      include_examples 'search results sorted'
+      include_examples 'search results sorted' do
+        let(:results_created) { described_class.new(user, 'sorted', [project.id], sort: sort) }
+        let(:results_updated) { described_class.new(user, 'updated', [project.id], sort: sort) }
+      end
     end
   end
 

ee/spec/services/search/global_service_spec.rb

@@ -145,7 +145,7 @@ RSpec.describe Search::GlobalService do
       end
 
       context 'ordering' do
-        let!(:project) { create(:project, :public) }
+        let_it_be(:project) { create(:project, :public) }
 
         let!(:old_result) { create(:issue, project: project, title: 'sorted old', created_at: 1.month.ago) }
         let!(:new_result) { create(:issue, project: project, title: 'sorted recent', created_at: 1.day.ago) }

ee/spec/services/search/group_service_spec.rb

@@ -242,7 +242,8 @@ RSpec.describe Search::GroupService, :elastic do
     let(:scope) { 'issues' }
 
     context 'sorting' do
-      let!(:project) { create(:project, :public, group: group) }
+      let_it_be(:group) { create(:group) }
+      let_it_be(:project) { create(:project, :public, group: group) }
 
       let!(:old_result) { create(:issue, project: project, title: 'sorted old', created_at: 1.month.ago) }
       let!(:new_result) { create(:issue, project: project, title: 'sorted recent', created_at: 1.day.ago) }

ee/spec/services/search/project_service_spec.rb

@@ -184,7 +184,7 @@ RSpec.describe Search::ProjectService do
     let(:scope) { 'issues' }
 
     context 'sorting', :elastic do
-      let!(:project) { create(:project, :public) }
+      let_it_be(:project) { create(:project, :public) }
 
       let!(:old_result) { create(:issue, project: project, title: 'sorted old', created_at: 1.month.ago) }
       let!(:new_result) { create(:issue, project: project, title: 'sorted recent', created_at: 1.day.ago) }
@@ -209,7 +209,7 @@ RSpec.describe Search::ProjectService do
     let(:scope) { 'merge_requests' }
 
     context 'sorting', :elastic do
-      let!(:project) { create(:project, :public) }
+      let(:project) { create(:project, :public) }
 
       let!(:old_result) { create(:merge_request, :opened, source_project: project, source_branch: 'old-1', title: 'sorted old', created_at: 1.month.ago) }
       let!(:new_result) { create(:merge_request, :opened, source_project: project, source_branch: 'new-1', title: 'sorted recent', created_at: 1.day.ago) }

spec/services/search/global_service_spec.rb

@@ -57,7 +57,7 @@ RSpec.describe Search::GlobalService do
     let(:scope) { 'issues' }
 
     context 'sorting' do
-      let!(:project) { create(:project, :public) }
+      let_it_be(:project) { create(:project, :public) }
 
       let!(:old_result) { create(:issue, project: project, title: 'sorted old', created_at: 1.month.ago) }
       let!(:new_result) { create(:issue, project: project, title: 'sorted recent', created_at: 1.day.ago) }

spec/services/search/group_service_spec.rb

@@ -45,8 +45,8 @@ RSpec.describe Search::GroupService do
     let(:scope) { 'issues' }
 
     context 'sorting' do
-      let!(:group) { create(:group) }
-      let!(:project) { create(:project, :public, group: group) }
+      let_it_be(:group) { create(:group) }
+      let_it_be(:project) { create(:project, :public, group: group) }
 
       let!(:old_result) { create(:issue, project: project, title: 'sorted old', created_at: 1.month.ago) }
       let!(:new_result) { create(:issue, project: project, title: 'sorted recent', created_at: 1.day.ago) }