Commit e2d94e07 authored by Andrew8xx8's avatar Andrew8xx8

State machine added for merge_status field

parent 1b7b17d1
...@@ -53,9 +53,25 @@ class MergeRequest < ActiveRecord::Base ...@@ -53,9 +53,25 @@ class MergeRequest < ActiveRecord::Base
BROKEN_DIFF = "--broken-diff" BROKEN_DIFF = "--broken-diff"
UNCHECKED = 1 state_machine :merge_status, initial: :unchecked do
CAN_BE_MERGED = 2 event :mark_as_unchecked do
CANNOT_BE_MERGED = 3 transition [:can_be_merged, :cannot_be_merged] => :unchecked
end
event :mark_as_mergeable do
transition unchecked: :can_be_merged
end
event :mark_as_unmergeable do
transition unchecked: :cannot_be_merged
end
state :unchecked
state :can_be_merged
state :cannot_be_merged
end
serialize :st_commits serialize :st_commits
serialize :st_diffs serialize :st_diffs
...@@ -84,13 +100,9 @@ class MergeRequest < ActiveRecord::Base ...@@ -84,13 +100,9 @@ class MergeRequest < ActiveRecord::Base
end end
end end
# DEPRECATED: Please use human_merge_status_name instead
def human_merge_status def human_merge_status
merge_statuses = { human_merge_status_name
CAN_BE_MERGED => "can_be_merged",
CANNOT_BE_MERGED => "cannot_be_merged",
UNCHECKED => "unchecked"
}
merge_statuses[self.merge_status]
end end
def validate_branches def validate_branches
...@@ -104,26 +116,12 @@ class MergeRequest < ActiveRecord::Base ...@@ -104,26 +116,12 @@ class MergeRequest < ActiveRecord::Base
self.reloaded_diffs self.reloaded_diffs
end end
def unchecked?
merge_status == UNCHECKED
end
def mark_as_unchecked
self.merge_status = UNCHECKED
self.save
end
def can_be_merged?
merge_status == CAN_BE_MERGED
end
def check_if_can_be_merged def check_if_can_be_merged
self.merge_status = if Gitlab::Satellite::MergeAction.new(self.author, self).can_be_merged? if Gitlab::Satellite::MergeAction.new(self.author, self).can_be_merged?
CAN_BE_MERGED mark_as_mergeable
else else
CANNOT_BE_MERGED mark_as_unmergeable
end end
self.save
end end
def diffs def diffs
...@@ -178,11 +176,6 @@ class MergeRequest < ActiveRecord::Base ...@@ -178,11 +176,6 @@ class MergeRequest < ActiveRecord::Base
commits.any? && opened? commits.any? && opened?
end end
def mark_as_unmergable
self.merge_status = CANNOT_BE_MERGED
self.save
end
def reloaded_commits def reloaded_commits
if opened? && unmerged_commits.any? if opened? && unmerged_commits.any?
self.st_commits = unmerged_commits self.st_commits = unmerged_commits
...@@ -217,7 +210,7 @@ class MergeRequest < ActiveRecord::Base ...@@ -217,7 +210,7 @@ class MergeRequest < ActiveRecord::Base
true true
end end
rescue rescue
self.mark_as_unmergable mark_as_unmergeable
false false
end end
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
$(function(){ $(function(){
merge_request = new MergeRequest({ merge_request = new MergeRequest({
url_to_automerge_check: "#{automerge_check_project_merge_request_path(@project, @merge_request)}", url_to_automerge_check: "#{automerge_check_project_merge_request_path(@project, @merge_request)}",
check_enable: #{@merge_request.merge_status == MergeRequest::UNCHECKED ? "true" : "false"}, check_enable: #{@merge_request.unchecked? ? "true" : "false"},
url_to_ci_check: "#{ci_status_project_merge_request_path(@project, @merge_request)}", url_to_ci_check: "#{ci_status_project_merge_request_path(@project, @merge_request)}",
ci_enable: #{@project.gitlab_ci? ? "true" : "false"}, ci_enable: #{@project.gitlab_ci? ? "true" : "false"},
current_status: "#{@merge_request.human_merge_status}", current_status: "#{@merge_request.human_merge_status}",
......
...@@ -32,6 +32,12 @@ describe MergeRequest do ...@@ -32,6 +32,12 @@ describe MergeRequest do
it { should_not allow_mass_assignment_of(:project_id) } it { should_not allow_mass_assignment_of(:project_id) }
end end
describe "Respond to" do
it { should respond_to(:unchecked?) }
it { should respond_to(:can_be_merged?) }
it { should respond_to(:cannot_be_merged?) }
end
describe 'modules' do describe 'modules' do
it { should include_module(Issuable) } it { should include_module(Issuable) }
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment