Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2012-09-26 21:34:51 +0400
committerRobert Speicher <rspeicher@gmail.com>2012-09-27 00:32:26 +0400
commit2df3b310f9727956c3ce84322928f3360616f5ad (patch)
tree57732da5f06bb8bd4c745d59629a93ae6c73a64e /spec
parent5cea3e576dfc2a0d01a44b647bbd1c14a202d9e3 (diff)
Rename branches and tags Repo methods to branch_names and tag_names
Diffstat (limited to 'spec')
-rw-r--r--spec/roles/repository_spec.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/roles/repository_spec.rb b/spec/roles/repository_spec.rb
index c4e0e9dec81..3507585aa8d 100644
--- a/spec/roles/repository_spec.rb
+++ b/spec/roles/repository_spec.rb
@@ -25,23 +25,23 @@ describe Project, "Repository" do
let(:stable) { 'stable' }
it "returns 'master' when master exists" do
- project.should_receive(:branches).at_least(:once).and_return([stable, master])
+ project.should_receive(:branch_names).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(:branches).at_least(:once).and_return([stable, master])
+ project.should_receive(:branch_names).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(:branches).at_least(:once).and_return([stable])
+ project.should_receive(:branch_names).at_least(:once).and_return([stable])
project.discover_default_branch.should == 'stable'
end
it "returns nil when no branch exists" do
- project.should_receive(:branches).at_least(:once).and_return([])
+ project.should_receive(:branch_names).at_least(:once).and_return([])
project.discover_default_branch.should be_nil
end
end