summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2017-06-29 14:11:42 +0200
committerJacob Vosmaer <jacob@gitlab.com>2017-07-04 13:02:10 +0200
commitf39fe34afb4a69ebca462219abb881e243f4a955 (patch)
treec22324e01d13876a0e8874b1837a31745a085cf0
parent8a62f304ef541b93ac47dab3b69b645f2b65537a (diff)
downloadgitlab-ce-f39fe34afb4a69ebca462219abb881e243f4a955.tar.gz
Add test for GitalyClient::Ref#find_ref_name
-rw-r--r--lib/gitlab/gitaly_client/ref.rb2
-rw-r--r--spec/lib/gitlab/gitaly_client/ref_spec.rb9
2 files changed, 10 insertions, 1 deletions
diff --git a/lib/gitlab/gitaly_client/ref.rb b/lib/gitlab/gitaly_client/ref.rb
index 2d61992f595..6edc69de078 100644
--- a/lib/gitlab/gitaly_client/ref.rb
+++ b/lib/gitlab/gitaly_client/ref.rb
@@ -34,7 +34,7 @@ module Gitlab
commit_id: commit_id,
prefix: ref_prefix
)
- GitalyClient.call(@storage, :ref, :find_ref_name, request).name
+ encode!(GitalyClient.call(@storage, :ref, :find_ref_name, request).name.dup)
end
def count_tag_names
diff --git a/spec/lib/gitlab/gitaly_client/ref_spec.rb b/spec/lib/gitlab/gitaly_client/ref_spec.rb
index 986ae348652..b7de7e598e3 100644
--- a/spec/lib/gitlab/gitaly_client/ref_spec.rb
+++ b/spec/lib/gitlab/gitaly_client/ref_spec.rb
@@ -78,4 +78,13 @@ describe Gitlab::GitalyClient::Ref do
expect { client.local_branches(sort_by: 'invalid_sort') }.to raise_error(ArgumentError)
end
end
+
+ describe '#find_ref_name', seed_helper: true do
+ let(:repository) { Gitlab::Git::Repository.new('default', TEST_REPO_PATH) }
+ let(:client) { described_class.new(repository) }
+ subject { client.find_ref_name(SeedRepo::Commit::ID, 'refs/heads/master') }
+
+ it { should be_utf8 }
+ it { should eq('refs/heads/master') }
+ end
end