Skip to content

Commit

Permalink
Remove spork
Browse files Browse the repository at this point in the history
  • Loading branch information
RohanM committed Apr 5, 2013
1 parent 5544ccb commit ed7bded
Show file tree
Hide file tree
Showing 4 changed files with 61 additions and 84 deletions.
1 change: 0 additions & 1 deletion Gemfile
Expand Up @@ -53,7 +53,6 @@ group :test, :development do
gem 'capybara'
gem 'database_cleaner', '0.7.1', :require => false
gem 'simplecov', :require => false
gem 'spork', '~> 1.0rc'
gem 'awesome_print'
gem "letter_opener"
end
Expand Down
2 changes: 0 additions & 2 deletions Gemfile.lock
Expand Up @@ -336,7 +336,6 @@ GEM
simplecov-html (~> 0.7.1)
simplecov-html (0.7.1)
slop (3.3.3)
spork (1.0.0rc3)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
Expand Down Expand Up @@ -403,7 +402,6 @@ DEPENDENCIES
shoulda-matchers
simple_form!
simplecov
spork (~> 1.0rc)
spree!
spree_auth_devise!
spree_heroku!
Expand Down
12 changes: 3 additions & 9 deletions README.markdown
Expand Up @@ -59,15 +59,9 @@ Then the tests can be run with:
bundle exec rspec spec

The site is configured to use
[Spork](https://github.com/sporkrb/spork) to reduce the pre-test
startup time while Rails loads. To use it, first start up a spork
instance:

bundle exec spork

When that's ready, you can run RSpec with the --drb flag:

bundle exec rspec --drb spec
[Zeus](https://github.com/burke/zeus) to reduce the pre-test
startup time while Rails loads. See the Zeus github page for
usage instructions.


## Deployment
Expand Down
130 changes: 58 additions & 72 deletions spec/spec_helper.rb
Expand Up @@ -2,84 +2,70 @@
SimpleCov.start

require 'rubygems'
require 'spork'
#uncomment the following line to use spork with the debugger
#require 'spork/ext/ruby-debug'


Spork.prefork do
ENV["RAILS_ENV"] ||= 'test'
require File.expand_path("../../config/environment", __FILE__)
require 'rspec/rails'
require 'rspec/autorun'
require 'capybara'
require 'database_cleaner'

# 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}
require 'spree/core/testing_support/controller_requests'

require 'active_record/fixtures'
fixtures_dir = File.expand_path('../../db/default', __FILE__)
ActiveRecord::Fixtures.create_fixtures(fixtures_dir, ['spree/states', 'spree/countries'])


RSpec.configure do |config|
# ## Mock Framework
#
# If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
#
# config.mock_with :mocha
# config.mock_with :flexmock
# config.mock_with :rr

# Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
config.fixture_path = "#{::Rails.root}/spec/fixtures"

# 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

# If true, the base class of anonymous controllers will be inferred
# automatically. This will be the default behavior in future versions of
# rspec-rails.
config.infer_base_class_for_anonymous_controllers = false

# ## Filters
#
config.filter_run_excluding :skip => true

config.before(:each) do
if example.metadata[:js]
DatabaseCleaner.strategy = :truncation, { :except => ['spree_countries', 'spree_states'] }
else
DatabaseCleaner.strategy = :transaction
end
DatabaseCleaner.start
end

config.after(:each) do
DatabaseCleaner.clean
ENV["RAILS_ENV"] ||= 'test'
require File.expand_path("../../config/environment", __FILE__)
require 'rspec/rails'
require 'rspec/autorun'
require 'capybara'
require 'database_cleaner'

# 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}
require 'spree/core/testing_support/controller_requests'

require 'active_record/fixtures'
fixtures_dir = File.expand_path('../../db/default', __FILE__)
ActiveRecord::Fixtures.create_fixtures(fixtures_dir, ['spree/states', 'spree/countries'])


RSpec.configure do |config|
# ## Mock Framework
#
# If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
#
# config.mock_with :mocha
# config.mock_with :flexmock
# config.mock_with :rr

# Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
config.fixture_path = "#{::Rails.root}/spec/fixtures"

# 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

# If true, the base class of anonymous controllers will be inferred
# automatically. This will be the default behavior in future versions of
# rspec-rails.
config.infer_base_class_for_anonymous_controllers = false

# ## Filters
#
config.filter_run_excluding :skip => true

config.before(:each) do
if example.metadata[:js]
DatabaseCleaner.strategy = :truncation, { :except => ['spree_countries', 'spree_states'] }
else
DatabaseCleaner.strategy = :transaction
end

config.include Rails.application.routes.url_helpers
config.include Spree::UrlHelpers
config.include Spree::Core::TestingSupport::ControllerRequests, :type => :controller
config.include Devise::TestHelpers, :type => :controller
DatabaseCleaner.start
end
end

Spork.each_run do
Dir["#{File.dirname(__FILE__)}/../app/**/*.rb"].each {|f| load f}
Dir["#{File.dirname(__FILE__)}/../lib/**/*.rb"].each {|f| load f}
config.after(:each) do
DatabaseCleaner.clean
end

Rails.application.reload_routes!
config.include Rails.application.routes.url_helpers
config.include Spree::UrlHelpers
config.include Spree::Core::TestingSupport::ControllerRequests, :type => :controller
config.include Devise::TestHelpers, :type => :controller

# Factory girl
require 'factory_girl_rails'

RSpec.configure do |config|
config.include FactoryGirl::Syntax::Methods
end
config.include FactoryGirl::Syntax::Methods
end

0 comments on commit ed7bded

Please sign in to comment.