1 files changed, 30 insertions, 7 deletions
diff --git a/spec/lib/gitlab/gitaly_client/commit_service_spec.rb b/spec/lib/gitlab/gitaly_client/commit_service_spec.rb
index 554a91f2bc5..d8e397dd6f3 100644
--- a/spec/lib/gitlab/gitaly_client/commit_service_spec.rb
+++ b/spec/lib/gitlab/gitaly_client/commit_service_spec.rb
@@ -112,15 +112,38 @@ RSpec.describe Gitlab::GitalyClient::CommitService do
     let(:from) { 'master' }
     let(:to) { Gitlab::Git::EMPTY_TREE_ID }
 
-    it 'sends an RPC request' do
-      request = Gitaly::CommitsBetweenRequest.new(
-        repository: repository_message, from: from, to: to
-      )
+    context 'with between_commits_via_list_commits enabled' do
+      before do
+        stub_feature_flags(between_commits_via_list_commits: true)
+      end
 
-      expect_any_instance_of(Gitaly::CommitService::Stub).to receive(:commits_between)
-        .with(request, kind_of(Hash)).and_return([])
+      it 'sends an RPC request' do
+        request = Gitaly::ListCommitsRequest.new(
+          repository: repository_message, revisions: ["^" + from, to], reverse: true
+        )
+
+        expect_any_instance_of(Gitaly::CommitService::Stub).to receive(:list_commits)
+          .with(request, kind_of(Hash)).and_return([])
 
-      described_class.new(repository).between(from, to)
+        described_class.new(repository).between(from, to)
+      end
+    end
+
+    context 'with between_commits_via_list_commits disabled' do
+      before do
+        stub_feature_flags(between_commits_via_list_commits: false)
+      end
+
+      it 'sends an RPC request' do
+        request = Gitaly::CommitsBetweenRequest.new(
+          repository: repository_message, from: from, to: to
+        )
+
+        expect_any_instance_of(Gitaly::CommitService::Stub).to receive(:commits_between)
+          .with(request, kind_of(Hash)).and_return([])
+
+        described_class.new(repository).between(from, to)
+      end
     end
   end