Commit 128f2845 authored by Izaak Alpert's avatar Izaak Alpert

Rebased on 6.0

-Had to do some minor test clean up as well

Change-Id: I8f378f1b5fe676d73b8691e870c11ca6def90cbf
parent 0ef055a4
......@@ -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
......
- 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.
......
......@@ -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
......
<<<<<<< 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
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment