diff options
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/factories.rb | 4 | ||||
| -rw-r--r-- | spec/features/notes_on_merge_requests_spec.rb | 2 | ||||
| -rw-r--r-- | spec/support/test_env.rb | 4 |
3 files changed, 4 insertions, 6 deletions
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 |