commit
58a1ed6dd3
2
Gemfile
2
Gemfile
|
@ -173,6 +173,8 @@ group :development, :test do
|
||||||
|
|
||||||
# PhantomJS driver for Capybara
|
# PhantomJS driver for Capybara
|
||||||
gem 'poltergeist', '1.1.0'
|
gem 'poltergeist', '1.1.0'
|
||||||
|
|
||||||
|
gem 'spork', '~> 1.0rc'
|
||||||
end
|
end
|
||||||
|
|
||||||
group :test do
|
group :test do
|
||||||
|
|
|
@ -447,6 +447,7 @@ GEM
|
||||||
capybara (~> 2.0.0)
|
capybara (~> 2.0.0)
|
||||||
railties (>= 3)
|
railties (>= 3)
|
||||||
spinach (>= 0.4)
|
spinach (>= 0.4)
|
||||||
|
spork (1.0.0rc3)
|
||||||
sprockets (2.2.2)
|
sprockets (2.2.2)
|
||||||
hike (~> 1.2)
|
hike (~> 1.2)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
|
@ -574,6 +575,7 @@ DEPENDENCIES
|
||||||
six
|
six
|
||||||
slim
|
slim
|
||||||
spinach-rails (= 0.2.0)
|
spinach-rails (= 0.2.0)
|
||||||
|
spork (~> 1.0rc)
|
||||||
stamp
|
stamp
|
||||||
state_machine
|
state_machine
|
||||||
test_after_commit
|
test_after_commit
|
||||||
|
|
|
@ -1,47 +1,62 @@
|
||||||
require 'simplecov' unless ENV['CI']
|
require 'rubygems'
|
||||||
|
require 'spork'
|
||||||
|
|
||||||
if ENV['TRAVIS']
|
Spork.prefork do
|
||||||
require 'coveralls'
|
require 'simplecov' unless ENV['CI']
|
||||||
Coveralls.wear!
|
|
||||||
end
|
|
||||||
|
|
||||||
# This file is copied to spec/ when you run 'rails generate rspec:install'
|
if ENV['TRAVIS']
|
||||||
ENV["RAILS_ENV"] ||= 'test'
|
require 'coveralls'
|
||||||
require File.expand_path("../../config/environment", __FILE__)
|
Coveralls.wear!
|
||||||
require 'rspec/rails'
|
end
|
||||||
require 'capybara/rails'
|
|
||||||
require 'capybara/rspec'
|
|
||||||
require 'webmock/rspec'
|
|
||||||
require 'email_spec'
|
|
||||||
require 'sidekiq/testing/inline'
|
|
||||||
require 'capybara/poltergeist'
|
|
||||||
Capybara.javascript_driver = :poltergeist
|
|
||||||
Capybara.default_wait_time = 10
|
|
||||||
|
|
||||||
# Requires supporting ruby files with custom matchers and macros, etc,
|
# This file is copied to spec/ when you run 'rails generate rspec:install'
|
||||||
# in spec/support/ and its subdirectories.
|
ENV["RAILS_ENV"] ||= 'test'
|
||||||
Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
|
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'
|
||||||
|
|
||||||
WebMock.disable_net_connect!(allow_localhost: true)
|
# Loading more in this block will cause your tests to run faster. However,
|
||||||
|
|
||||||
RSpec.configure do |config|
|
# if you change any configuration or code from libraries loaded here, you'll
|
||||||
config.mock_with :rspec
|
# need to restart spork for it take effect.
|
||||||
|
Capybara.javascript_driver = :poltergeist
|
||||||
|
Capybara.default_wait_time = 10
|
||||||
|
|
||||||
config.include LoginHelpers, type: :feature
|
# Requires supporting ruby files with custom matchers and macros, etc,
|
||||||
config.include LoginHelpers, type: :request
|
# in spec/support/ and its subdirectories.
|
||||||
config.include FactoryGirl::Syntax::Methods
|
Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
|
||||||
config.include Devise::TestHelpers, type: :controller
|
|
||||||
|
|
||||||
# If you're not using ActiveRecord, or you'd prefer not to run each of your
|
WebMock.disable_net_connect!(allow_localhost: true)
|
||||||
# examples within a transaction, remove the following line or assign false
|
|
||||||
# instead of true.
|
|
||||||
config.use_transactional_fixtures = false
|
|
||||||
|
|
||||||
config.before do
|
RSpec.configure do |config|
|
||||||
# Use tmp dir for FS manipulations
|
config.mock_with :rspec
|
||||||
temp_repos_path = Rails.root.join('tmp', 'test-git-base-path')
|
|
||||||
Gitlab.config.gitlab_shell.stub(repos_path: temp_repos_path)
|
config.include LoginHelpers, type: :feature
|
||||||
FileUtils.rm_rf temp_repos_path
|
config.include LoginHelpers, type: :request
|
||||||
FileUtils.mkdir_p temp_repos_path
|
config.include FactoryGirl::Syntax::Methods
|
||||||
|
config.include Devise::TestHelpers, type: :controller
|
||||||
|
|
||||||
|
# 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 do
|
||||||
|
# Use tmp dir for FS manipulations
|
||||||
|
temp_repos_path = Rails.root.join('tmp', 'test-git-base-path')
|
||||||
|
Gitlab.config.gitlab_shell.stub(repos_path: temp_repos_path)
|
||||||
|
FileUtils.rm_rf temp_repos_path
|
||||||
|
FileUtils.mkdir_p temp_repos_path
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Spork.each_run do
|
||||||
|
# This code will be run each time you run your specs.
|
||||||
|
|
||||||
|
end
|
||||||
|
|
Loading…
Reference in New Issue