deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix Repository role spec

Browse source
This commit is contained in:
Robert Speicher 2012-09-26 13:21:38 -04:00
parent e9bd45060e
commit 9f0e80591a
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/roles/repository.rb
View file

@ -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

12
spec/roles/repository_spec.rb
View file

@ -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