diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-03-19 21:54:18 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-03-21 14:30:29 +0300 |
commit | a4e19b6cb09d6f128942811b02b89aa671776ba2 (patch) | |
tree | 875d1aa16d6488342f95b3506fd8770866df1a46 /spec | |
parent | 8b90b1f3d4f80d4285577c80d800cc5afcbeb40e (diff) |
Merge branch 'issue-branch-iid-postfix' into 'master'
#to_branch_name now uses the iid as 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.
@DouweM Should this be labelled `pick-in-master`?
See merge request !3308
Diffstat (limited to 'spec')
-rw-r--r-- | spec/models/issue_spec.rb | 6 |
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 |