diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
tree | 5423a1c7516cffe36384133ade12572cf709398d /spec/lib/gitlab/gitaly_client | |
parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'spec/lib/gitlab/gitaly_client')
-rw-r--r-- | spec/lib/gitlab/gitaly_client/remote_service_spec.rb | 52 |
1 files changed, 40 insertions, 12 deletions
diff --git a/spec/lib/gitlab/gitaly_client/remote_service_spec.rb b/spec/lib/gitlab/gitaly_client/remote_service_spec.rb index b9ef76e1f41..70fc4fe4416 100644 --- a/spec/lib/gitlab/gitaly_client/remote_service_spec.rb +++ b/spec/lib/gitlab/gitaly_client/remote_service_spec.rb @@ -35,22 +35,50 @@ RSpec.describe Gitlab::GitalyClient::RemoteService do end describe '#find_remote_root_ref' do - it 'sends an find_remote_root_ref message and returns the root ref' do - expect_any_instance_of(Gitaly::RemoteService::Stub) - .to receive(:find_remote_root_ref) - .with(gitaly_request_with_path(storage_name, relative_path), kind_of(Hash)) - .and_return(double(ref: 'master')) + let(:remote) { 'origin' } + let(:url) { 'http://git.example.com/my-repo.git' } + let(:auth) { 'Basic secret' } + + shared_examples 'a find_remote_root_ref call' do + it 'sends an find_remote_root_ref message and returns the root ref' do + expect_any_instance_of(Gitaly::RemoteService::Stub) + .to receive(:find_remote_root_ref) + .with(gitaly_request_with_path(storage_name, relative_path), kind_of(Hash)) + .with(gitaly_request_with_params(expected_params), kind_of(Hash)) + .and_return(double(ref: 'master')) + + expect(client.find_remote_root_ref(remote, url, auth)).to eq 'master' + end + + it 'ensure ref is a valid UTF-8 string' do + expect_any_instance_of(Gitaly::RemoteService::Stub) + .to receive(:find_remote_root_ref) + .with(gitaly_request_with_path(storage_name, relative_path), kind_of(Hash)) + .with(gitaly_request_with_params(expected_params), kind_of(Hash)) + .and_return(double(ref: "an_invalid_ref_\xE5")) - expect(client.find_remote_root_ref('origin')).to eq 'master' + expect(client.find_remote_root_ref(remote, url, auth)).to eq "an_invalid_ref_å" + end end - it 'ensure ref is a valid UTF-8 string' do - expect_any_instance_of(Gitaly::RemoteService::Stub) - .to receive(:find_remote_root_ref) - .with(gitaly_request_with_path(storage_name, relative_path), kind_of(Hash)) - .and_return(double(ref: "an_invalid_ref_\xE5")) + context 'with inmemory feature enabled' do + before do + stub_feature_flags(find_remote_root_refs_inmemory: true) + end + + it_behaves_like 'a find_remote_root_ref call' do + let(:expected_params) { { remote_url: url, http_authorization_header: auth } } + end + end - expect(client.find_remote_root_ref('origin')).to eq "an_invalid_ref_å" + context 'with inmemory feature disabled' do + before do + stub_feature_flags(find_remote_root_refs_inmemory: false) + end + + it_behaves_like 'a find_remote_root_ref call' do + let(:expected_params) { { remote: remote } } + end end end |