diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-01 18:24:03 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-01 18:24:03 +0300 |
commit | 2e6bbb12f86806ee13699f8cff03f13449105eb9 (patch) | |
tree | cdc959b40361be56eeac44b7ac19ef984fb7a62d /spec/models/repository_spec.rb | |
parent | 804168e1def1204af712febb229f41a3865f085f (diff) |
Refactor can_be_merged logic for merge request
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'spec/models/repository_spec.rb')
-rw-r--r-- | spec/models/repository_spec.rb | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb index 77ceb6c8adc..a083dcb1274 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -33,4 +33,18 @@ describe Repository do it { is_expected.to be_nil } end end + + describe :can_be_merged? do + context 'mergeable branches' do + subject { repository.can_be_merged?('feature', 'master') } + + it { is_expected.to be_truthy } + end + + context 'non-mergeable branches' do + subject { repository.can_be_merged?('feature_conflict', 'feature') } + + it { is_expected.to be_falsey } + end + end end |