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

2 files changed, 42 insertions, 0 deletions

diff --git a/features/project/forked_merge_requests.feature b/features/project/forked_merge_requests.feature
new file mode 100644
index 00000000000..9f79fb8e53a
--- /dev/null
+++ b/features/project/forked_merge_requests.feature
@@ -0,0 +1,41 @@
+Feature: Project Forked Merge Requests
+  Background:
+    Given I sign in as a user
+    And I am a member of project "Shop"
+    And I have a project forked off of "Shop" called "Forked Shop"
+
+
+  @javascript
+  Scenario: I can visit the target projects commit for a forked merge request
+    Given I visit project "Forked Shop" merge requests page
+    And I click link "New Merge Request"
+    And I fill out a "Merge Request On Forked Project" merge request
+    And I follow the target commit link
+    Then I should see the commit under the forked from project
+
+  Scenario: I submit new unassigned merge request to a forked project
+    Given I visit project "Forked Shop" merge requests page
+    And I click link "New Merge Request"
+    And I fill out a "Merge Request On Forked Project" merge request
+    And I submit the merge request
+    Then I should see merge request "Merge Request On Forked Project"
+
+
+  Scenario: I should see a push widget for forked merge requests
+    Given project "Forked Shop" has push event
+    And I visit dashboard page
+    Then I should see last push widget
+    And I click "Create Merge Request on fork" link
+    Then I see prefilled new Merge Request page for the forked project
+
+
+  Scenario: I can edit a forked merge request
+    Given I visit project "Forked Shop" merge requests page
+    And I click link "New Merge Request"
+    And I fill out a "Merge Request On Forked Project" merge request
+    And I submit the merge request
+    And I should see merge request "Merge Request On Forked Project"
+    And I click link edit "Merge Request On Forked Project"
+    Then I see prefilled "Merge Request On Forked Project"
+
+
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature
index 5b8becbb6c9..63f27c3acc3 100644
--- a/features/project/merge_requests.feature
+++ b/features/project/merge_requests.feature
@@ -29,6 +29,7 @@ Feature: Project Merge Requests
     And I click link "Close"
     Then I should see closed merge request "Bug NS-04"
 
+  @javascript
   Scenario: I submit new unassigned merge request
     Given I click link "New Merge Request"
     And I submit new merge request "Wiki Feature"