Add latest changes from gitlab-org/gitlab@16-3-stable-eev16.3.0-rc42

1 files changed, 8 insertions, 7 deletions

diff --git a/spec/requests/projects/ml/models_controller_spec.rb b/spec/requests/projects/ml/models_controller_spec.rb
index d03748c8dff..8569f2396d3 100644
--- a/spec/requests/projects/ml/models_controller_spec.rb
+++ b/spec/requests/projects/ml/models_controller_spec.rb
@@ -5,9 +5,9 @@ require 'spec_helper'
 RSpec.describe Projects::Ml::ModelsController, feature_category: :mlops do
   let_it_be(:project) { create(:project, :repository) }
   let_it_be(:user) { project.first_owner }
-  let_it_be(:model1_a) { create(:ml_model_package, project: project) }
-  let_it_be(:model1_b) { create(:ml_model_package, project: project, name: model1_a.name) }
-  let_it_be(:model2) { create(:ml_model_package, project: project) }
+  let_it_be(:model1) { create(:ml_models, :with_versions, project: project) }
+  let_it_be(:model2) { create(:ml_models, project: project) }
+  let_it_be(:model_in_different_project) { create(:ml_models) }
 
   let(:model_registry_enabled) { true }
 
@@ -36,16 +36,17 @@ RSpec.describe Projects::Ml::ModelsController, feature_category: :mlops do
       index_request
     end
 
-    it 'prepares model view using the presenter' do
-      expect(::Ml::ModelsIndexPresenter).to receive(:new).and_call_original
-
+    it 'fetches the correct models' do
       index_request
+
+      expect(assigns(:models)).to match_array([model1, model2])
     end
 
     it 'does not perform N+1 sql queries' do
       control_count = ActiveRecord::QueryRecorder.new(skip_cached: false) { list_models }
 
-      create_list(:ml_model_package, 4, project: project)
+      create_list(:ml_model_versions, 2, model: model1)
+      create_list(:ml_model_versions, 2, model: model2)
 
       expect { list_models }.not_to exceed_all_query_limit(control_count)
     end