Add latest changes from gitlab-org/gitlab@master

2 files changed, 5 insertions, 35 deletions

diff --git a/spec/helpers/ci/pipeline_editor_helper_spec.rb b/spec/helpers/ci/pipeline_editor_helper_spec.rb
index 1a0f2e10a20..b45882d9888 100644
--- a/spec/helpers/ci/pipeline_editor_helper_spec.rb
+++ b/spec/helpers/ci/pipeline_editor_helper_spec.rb
@@ -4,6 +4,7 @@ require 'spec_helper'
 
 RSpec.describe Ci::PipelineEditorHelper do
   let_it_be(:project) { create(:project) }
+  let_it_be(:user) { create(:user) }
 
   describe 'can_view_pipeline_editor?' do
     subject { helper.can_view_pipeline_editor?(project) }
@@ -62,6 +63,10 @@ RSpec.describe Ci::PipelineEditorHelper do
         .to receive(:image_path)
         .with('illustrations/project-run-CICD-pipelines-sm.svg')
         .and_return('illustrations/validate.svg')
+
+      allow(helper)
+        .to receive(:current_user)
+        .and_return(user)
     end
 
     subject(:pipeline_editor_data) { helper.js_pipeline_editor_data(project) }
diff --git a/spec/helpers/projects/ml/experiments_helper_spec.rb b/spec/helpers/projects/ml/experiments_helper_spec.rb
index e0fbc8ac488..021d518a329 100644
--- a/spec/helpers/projects/ml/experiments_helper_spec.rb
+++ b/spec/helpers/projects/ml/experiments_helper_spec.rb
@@ -98,41 +98,6 @@ RSpec.describe Projects::Ml::ExperimentsHelper, feature_category: :mlops do
     end
   end
 
-  describe '#show_candidate_view_model' do
-    let(:candidate) { candidate0 }
-
-    subject { Gitlab::Json.parse(helper.show_candidate_view_model(candidate))['candidate'] }
-
-    it 'generates the correct params' do
-      expect(subject['params']).to include(
-        hash_including('name' => 'param1', 'value' => 'p1'),
-        hash_including('name' => 'param2', 'value' => 'p2')
-      )
-    end
-
-    it 'generates the correct metrics' do
-      expect(subject['metrics']).to include(
-        hash_including('name' => 'metric1', 'value' => 0.1),
-        hash_including('name' => 'metric2', 'value' => 0.2),
-        hash_including('name' => 'metric3', 'value' => 0.3)
-      )
-    end
-
-    it 'generates the correct info' do
-      expected_info = {
-        'iid' => candidate.iid,
-        'eid' => candidate.eid,
-        'path_to_artifact' => "/#{project.full_path}/-/packages/#{candidate.artifact.id}",
-        'experiment_name' => candidate.experiment.name,
-        'path_to_experiment' => "/#{project.full_path}/-/ml/experiments/#{experiment.iid}",
-        'status' => 'running',
-        'path' => "/#{project.full_path}/-/ml/candidates/#{candidate.iid}"
-      }
-
-      expect(subject['info']).to include(expected_info)
-    end
-  end
-
   describe '#experiments_as_data' do
     let(:experiments) { [experiment] }