diff options
author | Jacob Vosmaer <jacob@gitlab.com> | 2018-03-28 10:50:34 +0200 |
---|---|---|
committer | Jacob Vosmaer <jacob@gitlab.com> | 2018-03-28 10:50:34 +0200 |
commit | c0b41646a59a5608e8dbfce2aaf4130582c63509 (patch) | |
tree | d5805f344540607942f4f47e0f18896b86a46756 | |
parent | 3a15378c92a31cc872acf777f4a811f55d329f0c (diff) | |
download | gitlab-ce-c0b41646a59a5608e8dbfce2aaf4130582c63509.tar.gz |
Fix spec
-rw-r--r-- | spec/lib/gitlab/gitaly_client/util_spec.rb | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/spec/lib/gitlab/gitaly_client/util_spec.rb b/spec/lib/gitlab/gitaly_client/util_spec.rb index d1e0136f8c1..d7cabd2ab96 100644 --- a/spec/lib/gitlab/gitaly_client/util_spec.rb +++ b/spec/lib/gitlab/gitaly_client/util_spec.rb @@ -7,16 +7,19 @@ describe Gitlab::GitalyClient::Util do let(:gl_repository) { 'project-1' } let(:git_object_directory) { '.git/objects' } let(:git_alternate_object_directory) { ['/dir/one', '/dir/two'] } + let(:git_env) do + { + 'GIT_OBJECT_DIRECTORY_RELATIVE' => git_object_directory, + 'GIT_ALTERNATE_OBJECT_DIRECTORIES_RELATIVE' => git_alternate_object_directory + } + end subject do described_class.repository(repository_storage, relative_path, gl_repository) end it 'creates a Gitaly::Repository with the given data' do - allow(Gitlab::Git::Env).to receive(:[]).with('GIT_OBJECT_DIRECTORY_RELATIVE') - .and_return(git_object_directory) - allow(Gitlab::Git::Env).to receive(:[]).with('GIT_ALTERNATE_OBJECT_DIRECTORIES_RELATIVE') - .and_return(git_alternate_object_directory) + allow(Gitlab::Git::Env).to receive(:all).with(gl_repository).and_return(git_env) expect(subject).to be_a(Gitaly::Repository) expect(subject.storage_name).to eq(repository_storage) |