summaryrefslogtreecommitdiff
path: root/spec/models
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <zegerjan@gitlab.com>2016-03-18 19:34:04 +0100
committerZeger-Jan van de Weg <zegerjan@gitlab.com>2016-03-18 19:34:04 +0100
commit70ca3370ebc840ce8272c78bd7ff7f5ea0c957b1 (patch)
tree42b2a99520c33584a1cbfde4d239d69c5b23028b /spec/models
parenteba00325520a08939f3cb4b5a71c8beb8b457266 (diff)
downloadgitlab-ce-70ca3370ebc840ce8272c78bd7ff7f5ea0c957b1.tar.gz
\#to_branch_name now uses the iid as postfixissue-branch-iid-postfix
Given the branch name 'mep-mep' with an iid being 1, the current way, master's way, would yield a branch name of 1-mep-mep. The problem for larger projects however would be that a developer might forget what iid the issue was. When this developer would try to tab complete it would: - Or result in 20+ branches possibly - Or start with the wrong digit, try again with digit++ - Would see 20 branches, repeat Thus the obvious way of solving this is letting the dev tab complete on the issue title, which is easier to remember.
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/issue_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index 2ccdec1eeff..540a62eb1f8 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -131,7 +131,7 @@ describe Issue, models: true do
end
describe '#related_branches' do
- it "should " do
+ it "selects the right branches" do
allow(subject.project.repository).to receive(:branch_names).
and_return(["mpempe", "#{subject.iid}mepmep", subject.to_branch_name])
@@ -151,10 +151,10 @@ describe Issue, models: true do
end
describe "#to_branch_name" do
- let(:issue) { build(:issue, title: 'a' * 30) }
+ let(:issue) { create(:issue, title: 'a' * 30) }
it "starts with the issue iid" do
- expect(issue.to_branch_name).to match /\A#{issue.iid}-a+\z/
+ expect(issue.to_branch_name).to match /-#{issue.iid}\z/
end
end
end