Fix Repository role spec

diff --git a/app/roles/repository.rb b/app/roles/repository.rb
index 7118f15..191a6d7 100644 (file)
--- a/app/roles/repository.rb
+++ b/app/roles/repository.rb
@@ -45,14 +45,17 @@ module Repository
     File.exists?(hook_file)
   end
 
+  # Returns an Array of branch names
   def branches
     repo.branches.collect(&:name).sort
   end
 
+  # Returns an Array of tag names
   def tags
     repo.tags.collect(&:name).sort.reverse
   end
 
+  # Returns an Array of branch and tag names
   def ref_names
     [branches + tags].flatten
   end

diff --git a/spec/roles/repository_spec.rb b/spec/roles/repository_spec.rb
index 0fda57a..c4e0e9d 100644 (file)
--- a/spec/roles/repository_spec.rb
+++ b/spec/roles/repository_spec.rb
@@ -21,27 +21,27 @@ describe Project, "Repository" do
   end
 
   describe "#discover_default_branch" do
-    let(:master) { double(name: 'master') }
-    let(:stable) { double(name: 'stable') }
+    let(:master) { 'master' }
+    let(:stable) { 'stable' }
 
     it "returns 'master' when master exists" do
-      project.should_receive(:heads).and_return([stable, master])
+      project.should_receive(:branches).at_least(:once).and_return([stable, master])
       project.discover_default_branch.should == 'master'
     end
 
     it "returns non-master when master exists but default branch is set to something else" do
       project.default_branch = 'stable'
-      project.should_receive(:heads).and_return([stable, master])
+      project.should_receive(:branches).at_least(:once).and_return([stable, master])
       project.discover_default_branch.should == 'stable'
     end
 
     it "returns a non-master branch when only one exists" do
-      project.should_receive(:heads).and_return([stable])
+      project.should_receive(:branches).at_least(:once).and_return([stable])
       project.discover_default_branch.should == 'stable'
     end
 
     it "returns nil when no branch exists" do
-      project.should_receive(:heads).and_return([])
+      project.should_receive(:branches).at_least(:once).and_return([])
       project.discover_default_branch.should be_nil
     end
   end