Merge Request on forked projects

The good:

 - You can do a merge request for a forked commit and it will merge properly (i.e. it does work).
 - Push events take into account merge requests on forked projects
 - Tests around merge_actions now present, spinach, and other rspec tests
 - Satellites now clean themselves up rather then recreate

The questionable:

 - Events only know about target projects
 - Project's merge requests only hold on to MR's where they are the target
 - All operations performed in the satellite

The bad:

  -  Duplication between project's repositories and satellites (e.g. commits_between)

(for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos)

Fixes:

Make test repos/satellites only create when needed
-Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap)
-project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually
-fixed remote removal
-How to merge renders properly
-Update emails to show project/branches
-Edit MR doesn't set target branch
-Fix some failures on editing/creating merge requests, added a test
-Added back a test around merge request observer
-Clean up project_transfer_spec, Remove duplicate enable/disable observers
-Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well
-Signifant speed ups for tests
-Update formatting ordering in notes_on_merge_requests
-Remove wiki schema update
Fixes for search/search results
-Search results was using by_project for a list of projects, updated this to use in_projects
-updated search results to reference the correct (target) project
-udpated search results to print both sides of the merge request

Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8

5 files changed, 44 insertions, 28 deletions

diff --git a/spec/observers/activity_observer_spec.rb b/spec/observers/activity_observer_spec.rb
index 3d503027360..e93c969d5fe 100644
--- a/spec/observers/activity_observer_spec.rb
+++ b/spec/observers/activity_observer_spec.rb
@@ -8,18 +8,6 @@ describe ActivityObserver do
     it { @event.project.should == project }
   end
 
-  describe "Merge Request created" do
-    before do
-      MergeRequest.observers.enable :activity_observer do
-        @merge_request = create(:merge_request, project: project)
-        @event = Event.last
-      end
-    end
-
-    it_should_be_valid_event
-    it { @event.action.should == Event::CREATED }
-    it { @event.target.should == @merge_request }
-  end
 
   describe "Issue created" do
     before do
diff --git a/spec/observers/issue_observer_spec.rb b/spec/observers/issue_observer_spec.rb
index 3cc621013d2..c9e88aee1a5 100644
--- a/spec/observers/issue_observer_spec.rb
+++ b/spec/observers/issue_observer_spec.rb
@@ -26,14 +26,13 @@ describe IssueObserver do
       before { mock_issue.stub(state: 'closed') }
 
       it 'note is created if the issue is being closed' do
-        Note.should_receive(:create_status_change_note).with(mock_issue, some_user, 'closed')
+        Note.should_receive(:create_status_change_note).with(mock_issue, mock_issue.project, some_user, 'closed')
 
         subject.after_close(mock_issue, nil)
       end
 
       it 'trigger notification to send emails' do
         subject.notification.should_receive(:close_issue).with(mock_issue, some_user)
-
         subject.after_close(mock_issue, nil)
       end
     end
@@ -42,8 +41,7 @@ describe IssueObserver do
       before { mock_issue.stub(state: 'reopened') }
 
       it 'note is created if the issue is being reopened' do
-        Note.should_receive(:create_status_change_note).with(mock_issue, some_user, 'reopened')
-
+        Note.should_receive(:create_status_change_note).with(mock_issue, mock_issue.project, some_user, 'reopened')
         subject.after_reopen(mock_issue, nil)
       end
     end
diff --git a/spec/observers/merge_request_observer_spec.rb b/spec/observers/merge_request_observer_spec.rb
index 82c3fbc8a30..249700f543d 100644
--- a/spec/observers/merge_request_observer_spec.rb
+++ b/spec/observers/merge_request_observer_spec.rb
@@ -1,19 +1,21 @@
 require 'spec_helper'
 
 describe MergeRequestObserver do
-  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(: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_assigned_mr) { create(:closed_merge_request, assignee: assignee, author: author) }
   let(:closed_unassigned_mr) { create(:closed_merge_request, author: author) }
 
   before { subject.stub(:current_user).and_return(some_user) }
   before { subject.stub(notification: mock('NotificationService').as_null_object) }
+  before { mr_mock.stub(:author_id) }
+  before { mr_mock.stub(:target_project) }
   before(:each) { enable_observers }
-
+  after(:each) { disable_observers }
 
   subject { MergeRequestObserver.instance }
 
@@ -30,7 +32,7 @@ describe MergeRequestObserver do
     end
 
     it 'is called when a merge request is changed' do
-      changed = create(:merge_request, project: create(:project))
+      changed = create(:merge_request, source_project: create(:project))
       subject.should_receive(:after_update)
 
       MergeRequest.observers.enable :merge_request_observer do
@@ -59,13 +61,13 @@ describe MergeRequestObserver do
   context '#after_close' do
     context 'a status "closed"' do
       it 'note is created if the merge request is being closed' do
-        Note.should_receive(:create_status_change_note).with(assigned_mr, some_user, 'closed')
+        Note.should_receive(:create_status_change_note).with(assigned_mr, assigned_mr.target_project, some_user, 'closed')
 
         assigned_mr.close
       end
 
       it 'notification is delivered only to author if the merge request is being closed' do
-        Note.should_receive(:create_status_change_note).with(unassigned_mr, some_user, 'closed')
+        Note.should_receive(:create_status_change_note).with(unassigned_mr, unassigned_mr.target_project, some_user, 'closed')
 
         unassigned_mr.close
       end
@@ -75,16 +77,42 @@ describe MergeRequestObserver do
   context '#after_reopen' do
     context 'a status "reopened"' do
       it 'note is created if the merge request is being reopened' do
-        Note.should_receive(:create_status_change_note).with(closed_assigned_mr, some_user, 'reopened')
+        Note.should_receive(:create_status_change_note).with(closed_assigned_mr, closed_assigned_mr.target_project, some_user, 'reopened')
 
         closed_assigned_mr.reopen
       end
 
       it 'notification is delivered only to author if the merge request is being reopened' do
-        Note.should_receive(:create_status_change_note).with(closed_unassigned_mr, some_user, 'reopened')
+        Note.should_receive(:create_status_change_note).with(closed_unassigned_mr, closed_unassigned_mr.target_project, some_user, 'reopened')
 
         closed_unassigned_mr.reopen
       end
     end
   end
+
+
+  describe "Merge Request created" do
+    def self.it_should_be_valid_event
+      it { @event.should_not be_nil }
+      it { @event.should_not be_nil }
+      it { @event.project.should == project }
+      it { @event.project.should == project }
+    end
+
+    let(:project) { create(:project) }
+    before do
+      TestEnv.enable_observers
+      @merge_request = create(:merge_request, source_project: project, target_project: project)
+      @event = Event.last
+    end
+
+    after do
+      TestEnv.enable_observers
+    end
+
+    it_should_be_valid_event
+    it { @event.action.should == Event::CREATED }
+    it { @event.target.should == @merge_request }
+  end
+
 end
diff --git a/spec/observers/user_observer_spec.rb b/spec/observers/user_observer_spec.rb
index e0902b7eaf3..b74fceb98b1 100644
--- a/spec/observers/user_observer_spec.rb
+++ b/spec/observers/user_observer_spec.rb
@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe UserObserver do
   before(:each) { enable_observers }
+  after(:each) {disable_observers}
   subject { UserObserver.instance }
   before { subject.stub(notification: mock('NotificationService').as_null_object) }
 
diff --git a/spec/observers/users_project_observer_spec.rb b/spec/observers/users_project_observer_spec.rb
index b5f72946492..e33d8cc50fd 100644
--- a/spec/observers/users_project_observer_spec.rb
+++ b/spec/observers/users_project_observer_spec.rb
@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe UsersProjectObserver do
   before(:each) { enable_observers }
+  after(:each) { disable_observers }
 
   let(:user) { create(:user) }
   let(:project) { create(:project) }