diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-07 00:08:48 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-07 00:08:48 +0300 |
commit | a89cb5cbdd832d4d9e80517973aceda6bc0a3856 (patch) | |
tree | 574475bd0901a2f8906d36a4728b8bbb95b41e1c /spec/models/issue_spec.rb | |
parent | 0d6fa033121a9bef708b8f2de186c4034c61d4a3 (diff) |
Add latest changes from gitlab-org/gitlab@master
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 5aa74134692..c0501fb16c6 100644 --- a/spec/models/issue_spec.rb +++ b/spec/models/issue_spec.rb @@ -359,7 +359,7 @@ describe Issue do allow(subject.project).to receive(:repository).and_return(repository) end - context '#to_branch_name does not exists' do + describe '#to_branch_name does not exists' do before do allow(repository).to receive(:branch_exists?).and_return(false) end @@ -369,7 +369,7 @@ describe Issue do end end - context '#to_branch_name exists not ending with -index' do + describe '#to_branch_name exists not ending with -index' do before do allow(repository).to receive(:branch_exists?).and_return(true) allow(repository).to receive(:branch_exists?).with(/#{subject.to_branch_name}-\d/).and_return(false) @@ -380,7 +380,7 @@ describe Issue do end end - context '#to_branch_name exists ending with -index' do + describe '#to_branch_name exists ending with -index' do before do allow(repository).to receive(:branch_exists?).and_return(true) allow(repository).to receive(:branch_exists?).with("#{subject.to_branch_name}-3").and_return(false) |