Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42

1 files changed, 15 insertions, 1 deletions

diff --git a/spec/lib/gitlab/gitaly_client/repository_service_spec.rb b/spec/lib/gitlab/gitaly_client/repository_service_spec.rb
index 63d32cb906f..58ace05b0d3 100644
--- a/spec/lib/gitlab/gitaly_client/repository_service_spec.rb
+++ b/spec/lib/gitlab/gitaly_client/repository_service_spec.rb
@@ -308,7 +308,7 @@ RSpec.describe Gitlab::GitalyClient::RepositoryService do
   end
 
   describe '#replicate' do
-    let(:source_repository) { Gitlab::Git::Repository.new('default', TEST_MUTABLE_REPO_PATH, '', 'group/project') }
+    let(:source_repository) { Gitlab::Git::Repository.new('default', 'repo/path', '', 'group/project') }
 
     it 'sends a replicate_repository message' do
       expect_any_instance_of(Gitaly::RepositoryService::Stub)
@@ -343,4 +343,18 @@ RSpec.describe Gitlab::GitalyClient::RepositoryService do
       expect(client.full_path).to eq(path)
     end
   end
+
+  describe "#find_license" do
+    it 'sends a find_license request with medium timeout' do
+      expect_any_instance_of(Gitaly::RepositoryService::Stub)
+        .to receive(:find_license) do |_service, _request, headers|
+        expect(headers[:deadline]).to be_between(
+          Gitlab::GitalyClient.fast_timeout.seconds.from_now.to_f,
+          Gitlab::GitalyClient.medium_timeout.seconds.from_now.to_f
+        )
+      end
+
+      client.find_license
+    end
+  end
 end