Show 'New Merge Request' buttons on canonical repo.

2 files changed, 20 insertions, 0 deletions

diff --git a/features/project/fork.feature b/features/project/fork.feature
index 22f68e5b340..40849352370 100644
--- a/features/project/fork.feature
+++ b/features/project/fork.feature
@@ -1,3 +1,4 @@
+@forks
 Feature: Project Fork
   Background:
     Given I sign in as a user
@@ -14,3 +15,12 @@ Feature: Project Fork
     And I click link "Fork"
     When I fork to my namespace
     Then I should see a "Name has already been taken" warning
+
+  Scenario: Merge request on canonical repo goes to fork merge request page
+    Given I click link "Fork"
+    And I fork to my namespace
+    Then I should see the forked project page
+    When I visit project "Shop" page
+    Then I should see "New merge request"
+    And I goto the Merge Requests page
+    Then I should see "New merge request"
diff --git a/features/steps/project/fork.rb b/features/steps/project/fork.rb
index b0230add34f..878ddea46ff 100644
--- a/features/steps/project/fork.rb
+++ b/features/steps/project/fork.rb
@@ -30,4 +30,14 @@ class Spinach::Features::ProjectFork < Spinach::FeatureSteps
       click_link current_user.name
     end
   end
+
+  step 'I should see "New Merge Request"' do
+    expect(page).to have_content "New Merge Request"
+  end
+
+  step 'I goto the Merge Requests page' do
+    page.within '.page-sidebar-expanded' do
+      click_link "Merge Requests"
+    end
+  end
 end