3d7194f011
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
166 lines
4.4 KiB
Ruby
166 lines
4.4 KiB
Ruby
require 'rspec/mocks'
|
|
|
|
module TestEnv
|
|
extend self
|
|
|
|
# Test environment
|
|
#
|
|
# all repositories and namespaces stored at
|
|
# RAILS_APP/tmp/test-git-base-path
|
|
#
|
|
# Next shell methods are stubbed and return true
|
|
# - mv_repository
|
|
# - remove_repository
|
|
# - add_key
|
|
# - remove_key
|
|
#
|
|
def init(opts = {})
|
|
RSpec::Mocks::setup(self)
|
|
|
|
# Disable observers to improve test speed
|
|
#
|
|
# You can enable it in whole test case where needed by next string:
|
|
#
|
|
# before(:each) { enable_observers }
|
|
#
|
|
disable_observers if opts[:observers] == false
|
|
|
|
# Disable mailer for spinach tests
|
|
disable_mailer if opts[:mailer] == false
|
|
setup_stubs
|
|
|
|
|
|
clear_test_repo_dir if opts[:init_repos] == true
|
|
setup_test_repos(opts) if opts[:repos] == true
|
|
end
|
|
|
|
def testing_path
|
|
Rails.root.join('tmp', 'test-git-base-path')
|
|
end
|
|
|
|
def seed_repo_path
|
|
Rails.root.join('tmp', 'repositories', 'gitlabhq')
|
|
end
|
|
|
|
def seed_satellite_path
|
|
Rails.root.join('tmp', 'satellite', 'gitlabhq')
|
|
end
|
|
|
|
def satellite_path
|
|
"#{testing_path()}/satellite"
|
|
end
|
|
|
|
def repo(namespace, name)
|
|
unless (namespace.nil? || namespace.path.nil? || namespace.path.strip.empty?)
|
|
repo = File.join(testing_path(), "#{namespace.path}/#{name}.git")
|
|
else
|
|
repo = File.join(testing_path(), "#{name}.git")
|
|
end
|
|
end
|
|
|
|
def satellite(namespace, name)
|
|
unless (namespace.nil? || namespace.path.nil? || namespace.path.strip.empty?)
|
|
satellite_repo = File.join(satellite_path, namespace.path, name)
|
|
else
|
|
satellite_repo = File.join(satellite_path, name)
|
|
end
|
|
end
|
|
|
|
|
|
def setup_test_repos(opts ={})
|
|
create_repo(nil, 'gitlabhq') #unless opts[:repo].nil? || !opts[:repo].include?('')
|
|
create_repo(nil, 'source_gitlabhq') #unless opts[:repo].nil? || !opts[:repo].include?('source_')
|
|
create_repo(nil, 'target_gitlabhq') #unless opts[:repo].nil? || !opts[:repo].include?('target_')
|
|
end
|
|
|
|
def setup_stubs()
|
|
# Use tmp dir for FS manipulations
|
|
repos_path = testing_path()
|
|
GollumWiki.any_instance.stub(:init_repo) do |path|
|
|
create_temp_repo(File.join(repos_path, "#{path}.git"))
|
|
end
|
|
|
|
Gitlab.config.gitlab_shell.stub(repos_path: repos_path)
|
|
|
|
Gitlab.config.satellites.stub(path: satellite_path)
|
|
|
|
Gitlab::Git::Repository.stub(repos_path: repos_path)
|
|
|
|
Gitlab::Shell.any_instance.stub(
|
|
add_repository: true,
|
|
mv_repository: true,
|
|
remove_repository: true,
|
|
update_repository_head: true,
|
|
add_key: true,
|
|
remove_key: true
|
|
)
|
|
|
|
Gitlab::Satellite::Satellite.any_instance.stub(
|
|
exists?: true,
|
|
destroy: true,
|
|
create: true,
|
|
lock_files_dir: repos_path
|
|
)
|
|
|
|
MergeRequest.any_instance.stub(
|
|
check_if_can_be_merged: true
|
|
)
|
|
Repository.any_instance.stub(
|
|
size: 12.45
|
|
)
|
|
end
|
|
|
|
def clear_test_repo_dir
|
|
setup_stubs
|
|
# Use tmp dir for FS manipulations
|
|
repos_path = testing_path()
|
|
# Remove tmp/test-git-base-path
|
|
FileUtils.rm_rf Gitlab.config.gitlab_shell.repos_path
|
|
|
|
# Recreate tmp/test-git-base-path
|
|
FileUtils.mkdir_p Gitlab.config.gitlab_shell.repos_path
|
|
#Since much more is happening in satellites
|
|
FileUtils.mkdir_p Gitlab.config.satellites.path
|
|
end
|
|
|
|
def clear_repo_dir(namespace, name)
|
|
setup_stubs
|
|
#Clean any .wiki.git that may have been created
|
|
FileUtils.rm_rf File.join(testing_path(), "#{name}.wiki.git")
|
|
end
|
|
|
|
#Create a repo and it's satellite
|
|
def create_repo(namespace, name)
|
|
setup_stubs
|
|
repo = repo(namespace, name)
|
|
|
|
# Symlink tmp/repositories/gitlabhq to tmp/test-git-base-path/gitlabhq
|
|
system("ln -s -f #{seed_repo_path()} #{repo}")
|
|
create_satellite(repo, namespace, name)
|
|
end
|
|
|
|
# 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
|
|
system("ln -s -f #{seed_satellite_path()} #{satellite_repo}")
|
|
end
|
|
|
|
def create_temp_repo(path)
|
|
FileUtils.mkdir_p path
|
|
command = "git init --quiet --bare #{path};"
|
|
system(command)
|
|
end
|
|
|
|
def enable_observers
|
|
ActiveRecord::Base.observers.enable(:all)
|
|
end
|
|
|
|
def disable_observers
|
|
ActiveRecord::Base.observers.disable(:all)
|
|
end
|
|
|
|
def disable_mailer
|
|
NotificationService.any_instance.stub(mailer: double.as_null_object)
|
|
end
|
|
end
|