diff options
author | Katarzyna Kobierska <kkobierska@gmail.com> | 2016-09-06 16:48:59 +0200 |
---|---|---|
committer | Katarzyna Kobierska <kkobierska@gmail.com> | 2016-09-13 14:40:05 +0200 |
commit | 554baec9e8d2d077afff5502fdfa4ab78036499c (patch) | |
tree | 9114617783965076249276a08fbba007994f650e | |
parent | 81da7f137807a9f8c35b6c96b6034975558ddf97 (diff) | |
download | gitlab-ce-554baec9e8d2d077afff5502fdfa4ab78036499c.tar.gz |
Add method
-rw-r--r-- | app/models/merge_request.rb | 7 | ||||
-rw-r--r-- | spec/models/merge_request_spec.rb | 13 |
2 files changed, 20 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index f752a4fd1cc..5986a464bbc 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -327,6 +327,13 @@ class MergeRequest < ActiveRecord::Base !source_project.forked_from?(target_project) end + def can_reopen? + return false if closed_without_fork? || closed_without_source_project? + return true if closed? + + # false + end + def ensure_merge_request_diff merge_request_diff || create_merge_request_diff end diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index e223d51aa6a..4780d9fb3fe 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -1076,4 +1076,17 @@ describe MergeRequest, models: true do end end end + + describe '#can_reopen?' do + it "returns true" do + subject.close + binding.pry + + expect(subject.can_reopen?).to be_truthy + end + + it "returns false" do + expect(subject.can_reopen?).to be_falsey + end + end end |