diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-03-20 13:01:08 +0300 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-03-20 13:01:08 +0300 |
commit | 797af06491b8e9bbc7eb75466b0cf3fabd0f14d8 (patch) | |
tree | a9aee22a17942adf5722ae1057536581896a1e72 /spec/models/issue_spec.rb | |
parent | 6eb31056346ed07db4f66e4ba2369ff9779230c5 (diff) | |
parent | 01fe50a72513a88f2168c8c0a649661b1382a42b (diff) |
Merge branch 'master' into feature/issue-move
* master:
Fix bug where wrong commit ID was being used in a merge request diff to show old image
Remove CHANGELOG item that was added during merge resolution
Improve the "easy WIP & un-WIP from link" feature
Fix specs
\#to_branch_name now uses the iid as postfix
Add label description in tooltip to labels in issue index and sidebar
Easily (un)mark merge request as WIP using link
Use specialized system notes when MR is (un)marked as WIP
another attempt to fix oauth issue
attempting to fix omniauth problem
Conflicts:
app/assets/javascripts/issuable_form.js.coffee
Diffstat (limited to 'spec/models/issue_spec.rb')
-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 1b54d498169..05e4233243d 100644 --- a/spec/models/issue_spec.rb +++ b/spec/models/issue_spec.rb @@ -181,7 +181,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]) @@ -201,10 +201,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 |