Fix branch_names_contains

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
gitlabhq · Sep 29, 2014 · d305de1 · d305de1
1 parent 1c6cf0f
commit d305de1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/gitlab_git/repository.rb b/lib/gitlab_git/repository.rb
@@ -326,7 +326,7 @@ def find_commits(options = {})
       #   repo.branch_names_contains('master')
       #
       def branch_names_contains(commit)
-        branches_contains(commit).map { |c| c.target_id }
+        branches_contains(commit).map { |c| c.name }
       end
 
       # Returns branch collection that contains the special commit(SHA1 or name)

diff --git a/spec/repository_spec.rb b/spec/repository_spec.rb
@@ -12,7 +12,6 @@
     it { should respond_to(:tags) }
   end
 
-
   describe "#discover_default_branch" do
     let(:master) { 'master' }
     let(:feature) { 'feature' }
@@ -532,4 +531,12 @@
       repo.references.update("refs/heads/master", SeedRepo::LastCommit::ID)
     end
   end
+
+  describe "branch_names_contains" do
+    subject { repository.branch_names_contains(SeedRepo::LastCommit::ID) }
+
+    it { should include('master') }
+    it { should_not include('feature') }
+    it { should_not include('fix') }
+  end
 end