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

1 files changed, 10 insertions, 2 deletions

diff --git a/features/steps/shared/paths.rb b/features/steps/shared/paths.rb
index 67e14121c6d..ca852f8f08f 100644
--- a/features/steps/shared/paths.rb
+++ b/features/steps/shared/paths.rb
@@ -184,6 +184,10 @@ module SharedPaths
     visit project_path(project)
   end
 
+  step 'I visit project "Forked Shop" merge requests page' do
+    visit project_merge_requests_path(@forked_project)
+  end
+
   step 'I visit edit project "Shop" page' do
     visit edit_project_path(project)
   end
@@ -239,18 +243,22 @@ module SharedPaths
 
   step 'I visit merge request page "Bug NS-04"' do
     mr = MergeRequest.find_by_title("Bug NS-04")
-    visit project_merge_request_path(mr.project, mr)
+    visit project_merge_request_path(mr.target_project, mr)
   end
 
   step 'I visit merge request page "Bug NS-05"' do
     mr = MergeRequest.find_by_title("Bug NS-05")
-    visit project_merge_request_path(mr.project, mr)
+    visit project_merge_request_path(mr.target_project, mr)
   end
 
   step 'I visit project "Shop" merge requests page' do
     visit project_merge_requests_path(project)
   end
 
+  step 'I visit forked project "Shop" merge requests page' do
+    visit project_merge_requests_path(project)
+  end
+
   step 'I visit project "Shop" milestones page' do
     visit project_milestones_path(project)
   end