Permalink
Browse files

Removes spork.

  • Loading branch information...
1 parent 30c4a89 commit 6a5f7d963cfc798b8660457a35748d8236948c27 @jcxplorer committed Apr 2, 2011
Showing with 21 additions and 38 deletions.
  1. +0 −1 .rspec
  2. +2 −2 Gemfile
  3. +2 −2 Gemfile.lock
  4. +17 −33 spec/spec_helper.rb
View
1 .rspec
@@ -1,3 +1,2 @@
--format Fuubar
--colour
---drb
View
@@ -16,12 +16,12 @@ group :test do
gem "autotest"
gem "autotest-growl", :require => false
gem "capybara"
- gem "email_spec", :require => false
+ gem "database_cleaner"
+ gem "email_spec"
gem "factory_girl_rails", ">= 1.1.beta1"
gem "fuubar"
gem "launchy"
gem "shoulda-matchers", :require => false
- gem "spork", "~> 0.9.0.rc"
gem "timecop"
end
View
@@ -71,6 +71,7 @@ GEM
haml (>= 3.0.4)
configuration (1.2.0)
culerity (0.2.15)
+ database_cleaner (0.6.6)
devise (1.1.7)
bcrypt-ruby (~> 2.1.2)
warden (~> 1.0.2)
@@ -149,7 +150,6 @@ GEM
rubyzip
shoulda-matchers (1.0.0.beta1)
simple_form (1.3.1)
- spork (0.9.0.rc4)
sqlite3 (1.3.3)
sqlite3-ruby (1.3.3)
sqlite3 (>= 1.3.3)
@@ -173,6 +173,7 @@ DEPENDENCIES
autotest-growl
bson_ext
capybara
+ database_cleaner
devise
email_spec
factory_girl_rails (>= 1.1.beta1)
@@ -187,7 +188,6 @@ DEPENDENCIES
shoulda-matchers
simple_form
snowfinch-collector!
- spork (~> 0.9.0.rc)
sqlite3-ruby
steak
timecop
View
@@ -1,42 +1,26 @@
-require "spork"
+ENV["RAILS_ENV"] ||= "test"
+require File.expand_path("../../config/environment", __FILE__)
+require "rspec/rails"
+require "shoulda-matchers"
-Spork.prefork do
- require "rails/application"
- Spork.trap_method(Rails::Application, :reload_routes!)
+Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
- ENV["RAILS_ENV"] ||= "test"
- require File.expand_path("../../config/environment", __FILE__)
- require "rspec/rails"
- require "shoulda-matchers"
- require "email_spec"
+RSpec.configure do |config|
+ config.mock_with :rspec
+ config.use_transactional_fixtures = true
- Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
+ config.include EmailSpec::Helpers
+ config.include EmailSpec::Matchers
- RSpec.configure do |config|
- config.mock_with :rspec
- config.use_transactional_fixtures = true
+ config.before(:each) do
+ Capybara.reset_sessions!
- config.include EmailSpec::Helpers
- config.include EmailSpec::Matchers
-
- config.before(:each) do
- Capybara.reset_sessions!
-
- Mongo.db.collections.each do |collection|
- collection.drop unless collection.name =~ /^system\./
- end
- end
-
- config.after(:each) do
- Timecop.return
+ Mongo.db.collections.each do |collection|
+ collection.drop unless collection.name =~ /^system\./
end
end
-end
-
-Spork.each_run do
- FactoryGirl.registry = FactoryGirl::Registry.new
- load "factories.rb"
- I18n.reload!
+ config.after(:each) do
+ Timecop.return
+ end
end
-

0 comments on commit 6a5f7d9

Please sign in to comment.