Commit 9afccaa8 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #6554 from tsigo/remove-spork

Remove Spork
parents a5d7d125 2855a799
--color --drb
--color
......@@ -218,7 +218,6 @@ group :development, :test do
# PhantomJS driver for Capybara
gem 'poltergeist', '~> 1.4.1'
gem 'spork', '~> 1.0rc'
gem 'jasmine', '2.0.0.rc5'
gem "spring", '1.1.1'
......
......@@ -484,7 +484,6 @@ GEM
capybara (>= 2.0.0)
railties (>= 3)
spinach (>= 0.4)
spork (1.0.0rc4)
spring (1.1.1)
spring-commands-rspec (1.0.1)
spring (>= 0.9.1)
......@@ -661,7 +660,6 @@ DEPENDENCIES
slack-notifier (~> 0.2.0)
slim
spinach-rails
spork (~> 1.0rc)
spring (= 1.1.1)
spring-commands-rspec (= 1.0.1)
spring-commands-spinach (= 1.0.0)
......
require 'rubygems'
require 'spork'
# This file is copied to spec/ when you run 'rails generate rspec:install'
ENV["RAILS_ENV"] ||= 'test'
require File.expand_path("../../config/environment", __FILE__)
Spork.prefork do
require 'simplecov' unless ENV['CI']
require 'simplecov' unless ENV['CI']
if ENV['TRAVIS']
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'
end
# Loading more in this block will cause your tests to run faster. However,
require 'rspec/rails'
require 'capybara/rails'
require 'capybara/rspec'
require 'webmock/rspec'
require 'email_spec'
require 'sidekiq/testing/inline'
require 'capybara/poltergeist'
# 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
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}
# 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)
WebMock.disable_net_connect!(allow_localhost: true)
RSpec.configure do |config|
RSpec.configure do |config|
config.mock_with :rspec
config.include LoginHelpers, type: :feature
......@@ -54,10 +47,4 @@ Spork.prefork do
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
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