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
63 lines
1.8 KiB
Ruby
63 lines
1.8 KiB
Ruby
require 'rubygems'
|
|
require 'spork'
|
|
|
|
Spork.prefork do
|
|
require 'simplecov' unless ENV['CI']
|
|
|
|
if ENV['TRAVIS']
|
|
require 'coveralls'
|
|
Coveralls.wear!
|
|
end
|
|
|
|
# This file is copied to spec/ when you run 'rails generate rspec:install'
|
|
ENV["RAILS_ENV"] ||= 'test'
|
|
require File.expand_path("../../config/environment", __FILE__)
|
|
require 'rspec/rails'
|
|
require 'capybara/rails'
|
|
require 'capybara/rspec'
|
|
require 'webmock/rspec'
|
|
require 'email_spec'
|
|
require 'sidekiq/testing/inline'
|
|
require 'capybara/poltergeist'
|
|
|
|
# Loading more in this block will cause your tests to run faster. However,
|
|
|
|
# if you change any configuration or code from libraries loaded here, you'll
|
|
# need to restart spork for it take effect.
|
|
Capybara.javascript_driver = :poltergeist
|
|
Capybara.default_wait_time = 10
|
|
|
|
# Requires supporting ruby files with custom matchers and macros, etc,
|
|
# in spec/support/ and its subdirectories.
|
|
Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
|
|
|
|
WebMock.disable_net_connect!(allow_localhost: true)
|
|
|
|
RSpec.configure do |config|
|
|
config.mock_with :rspec
|
|
|
|
config.include LoginHelpers, type: :feature
|
|
config.include LoginHelpers, type: :request
|
|
config.include FactoryGirl::Syntax::Methods
|
|
config.include Devise::TestHelpers, type: :controller
|
|
|
|
config.include TestEnv
|
|
|
|
# If you're not using ActiveRecord, or you'd prefer not to run each of your
|
|
# examples within a transaction, remove the following line or assign false
|
|
# instead of true.
|
|
config.use_transactional_fixtures = false
|
|
|
|
config.before(:suite) do
|
|
TestEnv.init(observers: false, init_repos: true, repos: false)
|
|
end
|
|
config.before(:each) do
|
|
TestEnv.setup_stubs
|
|
end
|
|
end
|
|
end
|
|
|
|
Spork.each_run do
|
|
# This code will be run each time you run your specs.
|
|
|
|
end
|