Remove Spork

This commit is contained in:
Robert Speicher 2014-03-13 18:34:12 -04:00
parent 12d162993e
commit 1e3b5c3787
3 changed files with 44 additions and 60 deletions

View file

@ -218,7 +218,6 @@ group :development, :test do
# PhantomJS driver for Capybara # PhantomJS driver for Capybara
gem 'poltergeist', '~> 1.4.1' gem 'poltergeist', '~> 1.4.1'
gem 'spork', '~> 1.0rc'
gem 'jasmine', '2.0.0.rc5' gem 'jasmine', '2.0.0.rc5'
gem "spring", '1.1.1' gem "spring", '1.1.1'

View file

@ -484,7 +484,6 @@ GEM
capybara (>= 2.0.0) capybara (>= 2.0.0)
railties (>= 3) railties (>= 3)
spinach (>= 0.4) spinach (>= 0.4)
spork (1.0.0rc4)
spring (1.1.1) spring (1.1.1)
spring-commands-rspec (1.0.1) spring-commands-rspec (1.0.1)
spring (>= 0.9.1) spring (>= 0.9.1)
@ -661,7 +660,6 @@ DEPENDENCIES
slack-notifier (~> 0.2.0) slack-notifier (~> 0.2.0)
slim slim
spinach-rails spinach-rails
spork (~> 1.0rc)
spring (= 1.1.1) spring (= 1.1.1)
spring-commands-rspec (= 1.0.1) spring-commands-rspec (= 1.0.1)
spring-commands-spinach (= 1.0.0) spring-commands-spinach (= 1.0.0)

View file

@ -1,7 +1,7 @@
require 'rubygems' # This file is copied to spec/ when you run 'rails generate rspec:install'
require 'spork' 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']
@ -9,9 +9,6 @@ Spork.prefork do
Coveralls.wear! Coveralls.wear!
end 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 'rspec/rails'
require 'capybara/rails' require 'capybara/rails'
require 'capybara/rspec' require 'capybara/rspec'
@ -20,10 +17,6 @@ Spork.prefork do
require 'sidekiq/testing/inline' require 'sidekiq/testing/inline'
require 'capybara/poltergeist' 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.javascript_driver = :poltergeist
Capybara.default_wait_time = 10 Capybara.default_wait_time = 10
@ -55,9 +48,3 @@ Spork.prefork do
TestEnv.setup_stubs TestEnv.setup_stubs
end end
end end
end
Spork.each_run do
# This code will be run each time you run your specs.
end