2 files changed, 46 insertions, 13 deletions
diff --git a/spec/requests/projects/ml/candidates_controller_spec.rb b/spec/requests/projects/ml/candidates_controller_spec.rb
index 4a0fd1ce4f5..d3f9d92bc44 100644
--- a/spec/requests/projects/ml/candidates_controller_spec.rb
+++ b/spec/requests/projects/ml/candidates_controller_spec.rb
@@ -9,7 +9,6 @@ RSpec.describe Projects::Ml::CandidatesController, feature_category: :mlops do
   let_it_be(:candidate) { create(:ml_candidates, experiment: experiment, user: user) }
 
   let(:ff_value) { true }
-  let(:threshold) { 4 }
   let(:candidate_iid) { candidate.iid }
 
   before do
@@ -40,14 +39,13 @@ RSpec.describe Projects::Ml::CandidatesController, feature_category: :mlops do
       expect(response).to render_template('projects/ml/candidates/show')
     end
 
-    # MR removing this xit https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104166
-    xit 'does not perform N+1 sql queries' do
-      control_count = ActiveRecord::QueryRecorder.new { show_candidate }
+    it 'does not perform N+1 sql queries' do
+      control_count = ActiveRecord::QueryRecorder.new(skip_cached: false) { show_candidate }
 
       create_list(:ml_candidate_params, 3, candidate: candidate)
       create_list(:ml_candidate_metrics, 3, candidate: candidate)
 
-      expect { show_candidate }.not_to exceed_all_query_limit(control_count).with_threshold(threshold)
+      expect { show_candidate }.not_to exceed_all_query_limit(control_count)
     end
 
     context 'when candidate does not exist' do
diff --git a/spec/requests/projects/ml/experiments_controller_spec.rb b/spec/requests/projects/ml/experiments_controller_spec.rb
index f35f93b1e6c..e8b6f806251 100644
--- a/spec/requests/projects/ml/experiments_controller_spec.rb
+++ b/spec/requests/projects/ml/experiments_controller_spec.rb
@@ -68,24 +68,59 @@ RSpec.describe Projects::Ml::ExperimentsController, feature_category: :mlops do
   describe 'GET show' do
     let(:params) { basic_params.merge(id: experiment.iid) }
 
-    before do
+    it 'renders the template' do
       show_experiment
-    end
 
-    it 'renders the template' do
       expect(response).to render_template('projects/ml/experiments/show')
     end
 
-    # MR removing this xit https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104166
-    xit 'does not perform N+1 sql queries' do
-      control_count = ActiveRecord::QueryRecorder.new { show_experiment }
+    describe 'pagination' do
+      let_it_be(:candidates) { create_list(:ml_candidates, 5, experiment: experiment) }
+
+      before do
+        stub_const("Projects::Ml::ExperimentsController::MAX_CANDIDATES_PER_PAGE", 2)
+        candidates
+
+        show_experiment
+      end
+
+      context 'when out of bounds' do
+        let(:params) { basic_params.merge(id: experiment.iid, page: 10000) }
+
+        it 'redirects to last page' do
+          last_page = (experiment.candidates.size + 1) / 2
+
+          expect(response).to redirect_to(project_ml_experiment_path(project, experiment.iid, page: last_page))
+        end
+      end
+
+      context 'when bad page' do
+        let(:params) { basic_params.merge(id: experiment.iid, page: 's') }
+
+        it 'uses first page' do
+          expect(assigns(:pagination)).to include(
+            page: 1,
+            is_last_page: false,
+            per_page: 2,
+            total_items: experiment.candidates&.size
+          )
+        end
+      end
+    end
+
+    it 'does not perform N+1 sql queries' do
+      control_count = ActiveRecord::QueryRecorder.new(skip_cached: false) { show_experiment }
 
       create_list(:ml_candidates, 2, :with_metrics_and_params, experiment: experiment)
 
-      expect { show_experiment }.not_to exceed_all_query_limit(control_count).with_threshold(threshold)
+      expect { show_experiment }.not_to exceed_all_query_limit(control_count)
     end
 
-    it_behaves_like '404 if feature flag disabled'
+    it_behaves_like '404 if feature flag disabled' do
+      before do
+        show_experiment
+      end
+    end
   end
 
   private