1 files changed, 15 insertions, 6 deletions
diff --git a/spec/helpers/commits_helper_spec.rb b/spec/helpers/commits_helper_spec.rb
index 2f5f4c4596b..397751b07af 100644
--- a/spec/helpers/commits_helper_spec.rb
+++ b/spec/helpers/commits_helper_spec.rb
@@ -3,6 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe CommitsHelper do
+  include ProjectForksHelper
+
   describe '#revert_commit_link' do
     context 'when current_user exists' do
       before do
@@ -238,15 +240,22 @@ RSpec.describe CommitsHelper do
         expect(subject).to be_a(Gitlab::Git::DiffCollection)
       end
     end
+  end
 
-    context "feature flag is disabled" do
-      let(:paginate) { true }
+  describe '#cherry_pick_projects_data' do
+    let(:project) { create(:project, :repository) }
+    let(:user) { create(:user, maintainer_projects: [project]) }
+    let!(:forked_project) { fork_project(project, user, { namespace: user.namespace, repository: true }) }
 
-      it "returns a standard DiffCollection" do
-        stub_feature_flags(paginate_commit_view: false)
+    before do
+      allow(helper).to receive(:current_user).and_return(user)
+    end
 
-        expect(subject).to be_a(Gitlab::Git::DiffCollection)
-      end
+    it 'returns data for cherry picking into a project' do
+      expect(helper.cherry_pick_projects_data(project)).to match_array([
+        { id: project.id.to_s, name: project.full_path, refsUrl: refs_project_path(project) },
+        { id: forked_project.id.to_s, name: forked_project.full_path, refsUrl: refs_project_path(forked_project) }
+      ])
     end
   end
 end