Rebased on 6.0

-Had to do some minor test clean up as well

Change-Id: I8f378f1b5fe676d73b8691e870c11ca6def90cbf

7 files changed, 8 insertions, 9 deletions

diff --git a/app/views/projects/compare/show.html.haml b/app/views/projects/compare/show.html.haml
index 3a0b056060d..a6ad4e8d1e0 100644
--- a/app/views/projects/compare/show.html.haml
+++ b/app/views/projects/compare/show.html.haml
@@ -9,7 +9,7 @@
   .alert.alert-block
     %p
       %strong Warning! This comparison include 100+ commits.
-    %p To prevent performance issue we dont show diff information.
+    %p To prevent performance issues we dont show diff information.
 
 - if @commits.present?
   %div.ui-box
diff --git a/app/views/projects/merge_requests/show/_diffs.html.haml b/app/views/projects/merge_requests/show/_diffs.html.haml
index db384eda7db..25f63804858 100644
--- a/app/views/projects/merge_requests/show/_diffs.html.haml
+++ b/app/views/projects/merge_requests/show/_diffs.html.haml
@@ -1,5 +1,5 @@
 - if @merge_request.valid_diffs?
-  = render "projects/commits/diffs", diffs: @diffs, project: @merge_request.source_project
+  = render "projects/commits/diffs", diffs: @merge_request.diffs, project: @merge_request.source_project
 - elsif @merge_request.broken_diffs?
   %h4.nothing_here_message
     Can't load diff.
diff --git a/app/views/merge_requests/update_branches.js.haml b/app/views/projects/merge_requests/update_branches.js.haml
index 7324aa89a5e..7324aa89a5e 100644
--- a/app/views/merge_requests/update_branches.js.haml
+++ b/app/views/projects/merge_requests/update_branches.js.haml
diff --git a/features/steps/project/project_forked_merge_requests.rb b/features/steps/project/project_forked_merge_requests.rb
index a00a3b0a9ba..01689859cd7 100644
--- a/features/steps/project/project_forked_merge_requests.rb
+++ b/features/steps/project/project_forked_merge_requests.rb
@@ -14,9 +14,10 @@ class ProjectForkedMergeRequests < Spinach::FeatureSteps
     @forking_user = @user
     forked_project_link = build(:forked_project_link)
     @forked_project = Project.find_by_name "Forked Shop"
-    @forked_project ||= create(:source_project_with_code, name: "Forked Shop", forked_project_link: forked_project_link, creator_id: @forking_user.id)
+    @forked_project ||= create(:source_project_with_code, name: "Forked Shop", forked_project_link: forked_project_link, creator_id: @forking_user.id , namespace: @forking_user.namespace)
     forked_project_link.forked_from_project = @project
     forked_project_link.forked_to_project = @forked_project
+    @forked_project.team << [@forking_user , :master]
     forked_project_link.save!
   end
 
diff --git a/spec/factories.rb b/spec/factories.rb
index 3082e86f07f..b5f786dcd4c 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 include ActionDispatch::TestProcess
-=======
-require Rails.root.join('spec', 'support', 'test_env.rb')
->>>>>>> Merge Request on forked projects
 
 FactoryGirl.define do
   sequence :sentence, aliases: [:title, :content] do
diff --git a/spec/features/notes_on_merge_requests_spec.rb b/spec/features/notes_on_merge_requests_spec.rb
index 4fd7af89d21..16bdaf0f83c 100644
--- a/spec/features/notes_on_merge_requests_spec.rb
+++ b/spec/features/notes_on_merge_requests_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "On a merge request", js: true do
   let!(:project) { create(:project_with_code) }
   let!(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
-  let!(:note) { create(:note_on_merge_request_with_attachment,  source_project: project, target_project: project) }
+  let!(:note) { create(:note_on_merge_request_with_attachment,  project: project) }
 
   before do
     login_as :user
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb
index 6b83aad0182..a0528d98d57 100644
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
@@ -159,7 +159,9 @@ module TestEnv
   # Create a testing satellite, and clone the source repo into it
   def create_satellite(source_repo, namespace, satellite_name)
     satellite_repo = satellite(namespace, satellite_name)
-    # Symlink tmp/satellite/gitlabhq to tmp/test-git-base-path/satellite/gitlabhq
+    # Symlink tmp/satellite/gitlabhq to tmp/test-git-base-path/satellite/gitlabhq, create the directory if it doesn't exist already
+    satellite_dir = File.dirname(satellite_repo)
+    FileUtils.mkdir_p satellite_dir unless File.exists?(satellite_dir)
     system("ln -s -f #{seed_satellite_path()} #{satellite_repo}")
   end