Merge Request uses StateMachine now

Andrew8xx8
1 parent f9729659
Showing 15 changed files with 107 additions and 132 deletions Show diff stats
app/contexts/merge_requests_load_context.rb
app/controllers/merge_requests_controller.rb
app/helpers/merge_requests_helper.rb
app/models/merge_request.rb
app/observers/merge_request_observer.rb
app/views/merge_requests/show/_mr_accept.html.haml
app/views/merge_requests/show/_mr_box.html.haml
app/views/merge_requests/show/_mr_ci.html.haml
app/views/merge_requests/show/_mr_title.html.haml
app/views/milestones/show.html.haml
spec/factories.rb
spec/models/merge_request_spec.rb
spec/models/milestone_spec.rb
spec/models/project_spec.rb
spec/observers/merge_request_observer_spec.rb
@@ -14,7 +14,7 @@ class MergeRequestsLoadContext &lt; BaseContext
                      end
     merge_requests = merge_requests.page(params[:page]).per(20)
-    merge_requests = merge_requests.includes(:author, :project).order("closed, created_at desc")
+    merge_requests = merge_requests.includes(:author, :project).order("state, created_at desc")
     # Filter by specific assignee_id (or lack thereof)?
     if params[:assignee_id].present?
@@ -80,7 +80,7 @@ class MergeRequestsController &lt; ProjectResourceController
   def automerge
     return access_denied! unless can?(current_user, :accept_mr, @project)
-    if @merge_request.open? && @merge_request.can_be_merged?
+    if @merge_request.opened? && @merge_request.can_be_merged?
       @merge_request.should_remove_source_branch = params[:should_remove_source_branch]
       @merge_request.automerge!(current_user)
       @status = true
@@ -12,7 +12,7 @@ module MergeRequestsHelper
   def mr_css_classes mr
     classes = "merge_request"
-    classes << " closed" if mr.closed
+    classes << " closed" if mr.closed?
     classes << " merged" if mr.merged?
     classes
   end
@@ -9,15 +9,14 @@
 #  author_id     :integer
 #  assignee_id   :integer
 #  title         :string(255)
-#  closed        :boolean          default(FALSE), not null
+#  state         :string(255)      not null
 #  created_at    :datetime         not null
 #  updated_at    :datetime         not null
 #  st_commits    :text(2147483647)
 #  st_diffs      :text(2147483647)
-#  merged        :boolean          default(FALSE), not null
 #  merge_status  :integer          default(1), not null
-#  milestone_id  :integer
 #
+#  milestone_id  :integer
 require Rails.root.join("app/models/commit")
 require Rails.root.join("lib/static_model")
@@ -25,11 +24,33 @@ require Rails.root.join(&quot;lib/static_model&quot;)
 class MergeRequest < ActiveRecord::Base
   include Issuable
-  attr_accessible :title, :assignee_id, :closed, :target_branch, :source_branch, :milestone_id,
+  attr_accessible :title, :assignee_id, :target_branch, :source_branch, :milestone_id,
                   :author_id_of_changes
   attr_accessor :should_remove_source_branch
+  state_machine :state, :initial => :opened do
+    event :close do
+      transition [:reopened, :opened] => :closed
+    end
+
+    event :merge do
+      transition [:reopened, :opened] => :merged
+    end
+
+    event :reopen do
+      transition :closed => :reopened
+    end
+
+    state :opened
+
+    state :reopened
+
+    state :closed
+
+    state :merged
+  end
+
   BROKEN_DIFF = "--broken-diff"
   UNCHECKED = 1
@@ -43,6 +64,8 @@ class MergeRequest &lt; ActiveRecord::Base
   validates :target_branch, presence: true
   validate :validate_branches
+  scope :merged, -> { with_state(:merged) }
+
   def self.find_all_by_branch(branch_name)
     where("source_branch LIKE :branch OR target_branch LIKE :branch", branch: branch_name)
   end
@@ -98,7 +121,7 @@ class MergeRequest &lt; ActiveRecord::Base
   end
   def reloaded_diffs
-    if open? && unmerged_diffs.any?
+    if opened? && unmerged_diffs.any?
       self.st_diffs = unmerged_diffs
       self.save
     end
@@ -128,10 +151,6 @@ class MergeRequest &lt; ActiveRecord::Base
     commits.first
   end
-  def merged?
-    merged && merge_event
-  end
-
   def merge_event
     self.project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::MERGED).last
   end
@@ -146,17 +165,7 @@ class MergeRequest &lt; ActiveRecord::Base
   def probably_merged?
     unmerged_commits.empty? &&
-      commits.any? && open?
-  end
-
-  def open?
-    !closed
-  end
-
-  def mark_as_merged!
-    self.merged = true
-    self.closed = true
-    save
+      commits.any? && opened?
   end
   def mark_as_unmergable
@@ -165,7 +174,7 @@ class MergeRequest &lt; ActiveRecord::Base
   end
   def reloaded_commits
-    if open? && unmerged_commits.any?
+    if opened? && unmerged_commits.any?
       self.st_commits = unmerged_commits
       save
     end
@@ -181,7 +190,8 @@ class MergeRequest &lt; ActiveRecord::Base
   end
   def merge!(user_id)
-    self.mark_as_merged!
+    self.merge
+
     Event.create(
       project: self.project,
       action: Event::MERGED,
@@ -7,15 +7,20 @@ class MergeRequestObserver &lt; ActiveRecord::Observer
     end
   end
-  def after_update(merge_request)
+  def after_close(merge_request, transition)
     send_reassigned_email(merge_request) if merge_request.is_being_reassigned?
-    status = nil
-    status = 'closed' if merge_request.is_being_closed?
-    status = 'reopened' if merge_request.is_being_reopened?
-    if status
-      Note.create_status_change_note(merge_request, current_user, status)
-    end
+    Note.create_status_change_note(merge_request, current_user, merge_request.state)
+  end
+
+  def after_reopen(merge_request, transition)
+    send_reassigned_email(merge_request) if merge_request.is_being_reassigned?
+
+    Note.create_status_change_note(merge_request, current_user, merge_request.state)
+  end
+
+  def after_update(merge_request)
+    send_reassigned_email(merge_request) if merge_request.is_being_reassigned?
   end
   protected
@@ -3,7 +3,7 @@
     %strong Only masters can accept MR
-- if @merge_request.open? && @commits.any? && can?(current_user, :accept_mr, @project)
+- if @merge_request.opened? && @commits.any? && can?(current_user, :accept_mr, @project)
   .automerge_widget.can_be_merged{style: "display:none"}
     .alert.alert-success
       %span
 .ui-box.ui-box-show
   .ui-box-head
     %h4.box-title
-      - if @merge_request.merged
+      - if @merge_request.merged?
         .error.status_info
           %i.icon-ok
           Merged
-      - elsif @merge_request.closed
+      - elsif @merge_request.closed?
         .error.status_info Closed
       = gfm escape_once(@merge_request.title)
@@ -21,7 +21,7 @@
         %strong= link_to_gfm truncate(milestone.title, length: 20), project_milestone_path(milestone.project, milestone)
-  - if @merge_request.closed
+  - if @merge_request.closed?
     .ui-box-bottom
       - if @merge_request.merged?
         %span
-- if @merge_request.open? && @commits.any?
+- if @merge_request.opened? && @commits.any?
   .ci_widget.ci-success{style: "display:none"}
     .alert.alert-success
       %i.icon-ok
@@ -7,7 +7,7 @@
   %span.pull-right
     - if can?(current_user, :modify_merge_request, @merge_request)
-      - if @merge_request.open?
+      - if @merge_request.opened?
         .left.btn-group
           %a.btn.grouped.dropdown-toggle{ data: {toggle: :dropdown} }
             %i.icon-download-alt
@@ -77,7 +77,7 @@
           %li=link_to('All Merge Requests', '#')
       %ul.well-list
         - @merge_requests.each do |merge_request|
-          %li{data: {closed: merge_request.closed}}
+          %li{data: {closed: merge_request.closed?}}
             = link_to [@project, merge_request] do
               %span.badge.badge-info ##{merge_request.id}
             &ndash;
@@ -67,10 +67,6 @@ FactoryGirl.define do
     source_branch "master"
     target_branch "stable"
-    trait :closed do
-      closed true
-    end
-
     # pick 3 commits "at random" (from bcf03b5d~3 to bcf03b5d)
     trait :with_diffs do
       target_branch "master" # pretend bcf03b5d~3
@@ -85,7 +81,16 @@ FactoryGirl.define do
       end
     end
+    trait :closed do
+      state :closed
+    end
+
+    trait :reopened do
+      state :reopened
+    end
+
     factory :closed_merge_request, traits: [:closed]
+    factory :reopened_merge_request, traits: [:reopened]
     factory :merge_request_with_diffs, traits: [:with_diffs]
   end
@@ -37,6 +37,10 @@ describe MergeRequest do
   end
   describe "#mr_and_commit_notes" do
+
+  end
+
+  describe "#mr_and_commit_notes" do
     let!(:merge_request) { create(:merge_request) }
     before do
@@ -7,7 +7,7 @@
 #  project_id  :integer          not null
 #  description :text
 #  due_date    :date
-#  closed      :boolean          default(FALSE), not null
+#  state       :string           default(FALSE), not null
 #  created_at  :datetime         not null
 #  updated_at  :datetime         not null
 #
@@ -121,10 +121,7 @@ describe Project do
     let(:project) { create(:project) }
     before do
-      @merge_request = create(:merge_request,
-                              project: project,
-                              merged: false,
-                              closed: false)
+      @merge_request = create(:merge_request, project: project)
       @key = create(:key, user_id: project.owner.id)
     end
@@ -133,8 +130,7 @@ describe Project do
       @merge_request.last_commit.id.should == "bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a"
       project.update_merge_requests("8716fc78f3c65bbf7bcf7b574febd583bc5d2812", "bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a", "refs/heads/stable", @key.user)
       @merge_request.reload
-      @merge_request.merged.should be_true
-      @merge_request.closed.should be_true
+      @merge_request.merged?.should be_true
     end
     it "should update merge request commits with new one if pushed to source branch" do
 require 'spec_helper'
 describe MergeRequestObserver do
-  let(:some_user) { double(:user, id: 1) }
-  let(:assignee) { double(:user, id: 2) }
-  let(:author) { double(:user, id: 3) }
-  let(:mr)    { double(:merge_request, id: 42, assignee: assignee, author: author) }
+  let(:some_user)      { create :user }
+  let(:assignee)       { create :user }
+  let(:author)         { create :user }
+  let(:mr_mock)    { double(:merge_request, id: 42, assignee: assignee, author: author) }
+  let(:assigned_mr)   { create(:merge_request, assignee: assignee, author: author) }
+  let(:unassigned_mr) { create(:merge_request, author: author) }
+  let(:closed_assigned_mr)   { create(:closed_merge_request, assignee: assignee, author: author) }
+  let(:closed_unassigned_mr) { create(:closed_merge_request, author: author) }
   before(:each) { subject.stub(:current_user).and_return(some_user) }
@@ -21,23 +25,21 @@ describe MergeRequestObserver do
     end
     it 'sends an email to the assignee' do
-      Notify.should_receive(:new_merge_request_email).with(mr.id)
-      subject.after_create(mr)
+      Notify.should_receive(:new_merge_request_email).with(mr_mock.id)
+      subject.after_create(mr_mock)
     end
     it 'does not send an email to the assignee if assignee created the merge request' do
       subject.stub(:current_user).and_return(assignee)
       Notify.should_not_receive(:new_merge_request_email)
-      subject.after_create(mr)
+      subject.after_create(mr_mock)
     end
   end
   context '#after_update' do
     before(:each) do
-      mr.stub(:is_being_reassigned?).and_return(false)
-      mr.stub(:is_being_closed?).and_return(false)
-      mr.stub(:is_being_reopened?).and_return(false)
+      mr_mock.stub(:is_being_reassigned?).and_return(false)
     end
     it 'is called when a merge request is changed' do
@@ -52,97 +54,50 @@ describe MergeRequestObserver do
     context 'a reassigned email' do
       it 'is sent if the merge request is being reassigned' do
-        mr.should_receive(:is_being_reassigned?).and_return(true)
-        subject.should_receive(:send_reassigned_email).with(mr)
+        mr_mock.should_receive(:is_being_reassigned?).and_return(true)
+        subject.should_receive(:send_reassigned_email).with(mr_mock)
-        subject.after_update(mr)
+        subject.after_update(mr_mock)
       end
       it 'is not sent if the merge request is not being reassigned' do
-        mr.should_receive(:is_being_reassigned?).and_return(false)
+        mr_mock.should_receive(:is_being_reassigned?).and_return(false)
         subject.should_not_receive(:send_reassigned_email)
-        subject.after_update(mr)
+        subject.after_update(mr_mock)
       end
     end
+  end
+
+  context '#after_close' do
     context 'a status "closed"' do
       it 'note is created if the merge request is being closed' do
-        mr.should_receive(:is_being_closed?).and_return(true)
-        Note.should_receive(:create_status_change_note).with(mr, some_user, 'closed')
-
-        subject.after_update(mr)
-      end
-
-      it 'note is not created if the merge request is not being closed' do
-        mr.should_receive(:is_being_closed?).and_return(false)
-        Note.should_not_receive(:create_status_change_note).with(mr, some_user, 'closed')
-
-        subject.after_update(mr)
-      end
-
-      it 'notification is delivered if the merge request being closed' do
-        mr.stub(:is_being_closed?).and_return(true)
-        Note.should_receive(:create_status_change_note).with(mr, some_user, 'closed')
-
-        subject.after_update(mr)
-      end
-
-      it 'notification is not delivered if the merge request not being closed' do
-        mr.stub(:is_being_closed?).and_return(false)
-        Note.should_not_receive(:create_status_change_note).with(mr, some_user, 'closed')
+        Note.should_receive(:create_status_change_note).with(assigned_mr, some_user, 'closed')
-        subject.after_update(mr)
+        assigned_mr.close
       end
       it 'notification is delivered only to author if the merge request is being closed' do
-        mr_without_assignee = double(:merge_request, id: 42, author: author, assignee: nil)
-        mr_without_assignee.stub(:is_being_reassigned?).and_return(false)
-        mr_without_assignee.stub(:is_being_closed?).and_return(true)
-        mr_without_assignee.stub(:is_being_reopened?).and_return(false)
-        Note.should_receive(:create_status_change_note).with(mr_without_assignee, some_user, 'closed')
+        Note.should_receive(:create_status_change_note).with(unassigned_mr, some_user, 'closed')
-        subject.after_update(mr_without_assignee)
+        unassigned_mr.close
       end
     end
+  end
+  context '#after_reopen' do
     context 'a status "reopened"' do
       it 'note is created if the merge request is being reopened' do
-        mr.should_receive(:is_being_reopened?).and_return(true)
-        Note.should_receive(:create_status_change_note).with(mr, some_user, 'reopened')
-
-        subject.after_update(mr)
-      end
-
-      it 'note is not created if the merge request is not being reopened' do
-        mr.should_receive(:is_being_reopened?).and_return(false)
-        Note.should_not_receive(:create_status_change_note).with(mr, some_user, 'reopened')
-
-        subject.after_update(mr)
-      end
-
-      it 'notification is delivered if the merge request being reopened' do
-        mr.stub(:is_being_reopened?).and_return(true)
-        Note.should_receive(:create_status_change_note).with(mr, some_user, 'reopened')
-
-        subject.after_update(mr)
-      end
-
-      it 'notification is not delivered if the merge request is not being reopened' do
-        mr.stub(:is_being_reopened?).and_return(false)
-        Note.should_not_receive(:create_status_change_note).with(mr, some_user, 'reopened')
+        Note.should_receive(:create_status_change_note).with(closed_assigned_mr, some_user, 'reopened')
-        subject.after_update(mr)
+        closed_assigned_mr.reopen
       end
       it 'notification is delivered only to author if the merge request is being reopened' do
-        mr_without_assignee = double(:merge_request, id: 42, author: author, assignee: nil)
-        mr_without_assignee.stub(:is_being_reassigned?).and_return(false)
-        mr_without_assignee.stub(:is_being_closed?).and_return(false)
-        mr_without_assignee.stub(:is_being_reopened?).and_return(true)
-        Note.should_receive(:create_status_change_note).with(mr_without_assignee, some_user, 'reopened')
+        Note.should_receive(:create_status_change_note).with(closed_unassigned_mr, some_user, 'reopened')
-        subject.after_update(mr_without_assignee)
+        closed_unassigned_mr.reopen
       end
     end
   end
@@ -151,23 +106,23 @@ describe MergeRequestObserver do
     let(:previous_assignee) { double(:user, id: 3) }
     before(:each) do
-      mr.stub(:assignee_id).and_return(assignee.id)
-      mr.stub(:assignee_id_was).and_return(previous_assignee.id)
+      mr_mock.stub(:assignee_id).and_return(assignee.id)
+      mr_mock.stub(:assignee_id_was).and_return(previous_assignee.id)
     end
     def it_sends_a_reassigned_email_to(recipient)
-      Notify.should_receive(:reassigned_merge_request_email).with(recipient, mr.id, previous_assignee.id)
+      Notify.should_receive(:reassigned_merge_request_email).with(recipient, mr_mock.id, previous_assignee.id)
     end
     def it_does_not_send_a_reassigned_email_to(recipient)
-      Notify.should_not_receive(:reassigned_merge_request_email).with(recipient, mr.id, previous_assignee.id)
+      Notify.should_not_receive(:reassigned_merge_request_email).with(recipient, mr_mock.id, previous_assignee.id)
     end
     it 'sends a reassigned email to the previous and current assignees' do
       it_sends_a_reassigned_email_to assignee.id
       it_sends_a_reassigned_email_to previous_assignee.id
-      subject.send(:send_reassigned_email, mr)
+      subject.send(:send_reassigned_email, mr_mock)
     end
     context 'does not send an email to the user who made the reassignment' do
@@ -176,14 +131,14 @@ describe MergeRequestObserver do
         it_sends_a_reassigned_email_to previous_assignee.id
         it_does_not_send_a_reassigned_email_to assignee.id
-        subject.send(:send_reassigned_email, mr)
+        subject.send(:send_reassigned_email, mr_mock)
       end
       it 'if the user is the previous assignee' do
         subject.stub(:current_user).and_return(previous_assignee)
         it_sends_a_reassigned_email_to assignee.id
         it_does_not_send_a_reassigned_email_to previous_assignee.id
-        subject.send(:send_reassigned_email, mr)
+        subject.send(:send_reassigned_email, mr_mock)
       end
     end
   end
	@@ -14,7 +14,7 @@ class MergeRequestsLoadContext < BaseContext		@@ -14,7 +14,7 @@ class MergeRequestsLoadContext < BaseContext
14	end	14	end
15		15
16	merge_requests = merge_requests.page(params[:page]).per(20)	16	merge_requests = merge_requests.page(params[:page]).per(20)
17	- merge_requests = merge_requests.includes(:author, :project).order("closed, created_at desc")	17	+ merge_requests = merge_requests.includes(:author, :project).order("state, created_at desc")
18		18
19	# Filter by specific assignee_id (or lack thereof)?	19	# Filter by specific assignee_id (or lack thereof)?
20	if params[:assignee_id].present?	20	if params[:assignee_id].present?
	@@ -80,7 +80,7 @@ class MergeRequestsController < ProjectResourceController		@@ -80,7 +80,7 @@ class MergeRequestsController < ProjectResourceController
80		80
81	def automerge	81	def automerge
82	return access_denied! unless can?(current_user, :accept_mr, @project)	82	return access_denied! unless can?(current_user, :accept_mr, @project)
83	- if @merge_request.open? && @merge_request.can_be_merged?	83	+ if @merge_request.opened? && @merge_request.can_be_merged?
84	@merge_request.should_remove_source_branch = params[:should_remove_source_branch]	84	@merge_request.should_remove_source_branch = params[:should_remove_source_branch]
85	@merge_request.automerge!(current_user)	85	@merge_request.automerge!(current_user)
86	@status = true	86	@status = true
	@@ -12,7 +12,7 @@ module MergeRequestsHelper		@@ -12,7 +12,7 @@ module MergeRequestsHelper
12		12
13	def mr_css_classes mr	13	def mr_css_classes mr
14	classes = "merge_request"	14	classes = "merge_request"
15	- classes << " closed" if mr.closed	15	+ classes << " closed" if mr.closed?
16	classes << " merged" if mr.merged?	16	classes << " merged" if mr.merged?
17	classes	17	classes
18	end	18	end
	@@ -3,7 +3,7 @@		@@ -3,7 +3,7 @@
3	%strong Only masters can accept MR	3	%strong Only masters can accept MR
4		4
5		5
6	-- if @merge_request.open? && @commits.any? && can?(current_user, :accept_mr, @project)	6	+- if @merge_request.opened? && @commits.any? && can?(current_user, :accept_mr, @project)
7	.automerge_widget.can_be_merged{style: "display:none"}	7	.automerge_widget.can_be_merged{style: "display:none"}
8	.alert.alert-success	8	.alert.alert-success
9	%span	9	%span
1	.ui-box.ui-box-show	1	.ui-box.ui-box-show
2	.ui-box-head	2	.ui-box-head
3	%h4.box-title	3	%h4.box-title
4	- - if @merge_request.merged	4	+ - if @merge_request.merged?
5	.error.status_info	5	.error.status_info
6	%i.icon-ok	6	%i.icon-ok
7	Merged	7	Merged
8	- - elsif @merge_request.closed	8	+ - elsif @merge_request.closed?
9	.error.status_info Closed	9	.error.status_info Closed
10	= gfm escape_once(@merge_request.title)	10	= gfm escape_once(@merge_request.title)
11		11
	@@ -21,7 +21,7 @@		@@ -21,7 +21,7 @@
21	%strong= link_to_gfm truncate(milestone.title, length: 20), project_milestone_path(milestone.project, milestone)	21	%strong= link_to_gfm truncate(milestone.title, length: 20), project_milestone_path(milestone.project, milestone)
22		22
23		23
24	- - if @merge_request.closed	24	+ - if @merge_request.closed?
25	.ui-box-bottom	25	.ui-box-bottom
26	- if @merge_request.merged?	26	- if @merge_request.merged?
27	%span	27	%span
1	-- if @merge_request.open? && @commits.any?	1	+- if @merge_request.opened? && @commits.any?
2	.ci_widget.ci-success{style: "display:none"}	2	.ci_widget.ci-success{style: "display:none"}
3	.alert.alert-success	3	.alert.alert-success
4	%i.icon-ok	4	%i.icon-ok
	@@ -7,7 +7,7 @@		@@ -7,7 +7,7 @@
7		7
8	%span.pull-right	8	%span.pull-right
9	- if can?(current_user, :modify_merge_request, @merge_request)	9	- if can?(current_user, :modify_merge_request, @merge_request)
10	- - if @merge_request.open?	10	+ - if @merge_request.opened?
11	.left.btn-group	11	.left.btn-group
12	%a.btn.grouped.dropdown-toggle{ data: {toggle: :dropdown} }	12	%a.btn.grouped.dropdown-toggle{ data: {toggle: :dropdown} }
13	%i.icon-download-alt	13	%i.icon-download-alt
	@@ -77,7 +77,7 @@		@@ -77,7 +77,7 @@
77	%li=link_to('All Merge Requests', '#')	77	%li=link_to('All Merge Requests', '#')
78	%ul.well-list	78	%ul.well-list
79	- @merge_requests.each do \|merge_request\|	79	- @merge_requests.each do \|merge_request\|
80	- %li{data: {closed: merge_request.closed}}	80	+ %li{data: {closed: merge_request.closed?}}
81	= link_to [@project, merge_request] do	81	= link_to [@project, merge_request] do
82	%span.badge.badge-info ##{merge_request.id}	82	%span.badge.badge-info ##{merge_request.id}
83	–	83	–
	@@ -7,7 +7,7 @@		@@ -7,7 +7,7 @@
7	# project_id :integer not null	7	# project_id :integer not null
8	# description :text	8	# description :text
9	# due_date :date	9	# due_date :date
10	-# closed :boolean default(FALSE), not null	10	+# state :string default(FALSE), not null
11	# created_at :datetime not null	11	# created_at :datetime not null
12	# updated_at :datetime not null	12	# updated_at :datetime not null
13	#	13	#