spec/spec_helper.rb in rest-assured-1.2.2 vs spec/spec_helper.rb in rest-assured-2.0.0

@@ -1,8 +1,6 @@
-require 'rubygems'
-
-if RUBY_VERSION =~ /^1.9/
+if ENV['COVERAGE']
   begin
     require 'simplecov'
     SimpleCov.start do
       at_exit {} # reset built in at_exit or else it gets triggered when RestAssured::Server.stop is called from tests
       add_filter "/spec/"
@@ -10,74 +8,67 @@
     end
   rescue LoadError
   end
 end
 
-require 'spork'
-
 $:.unshift(File.expand_path('../../lib'), __FILE__)
 
-Spork.prefork do
-  require 'rspec'
-  require 'capybara/rspec'
-  require 'rack/test'
-  require 'database_cleaner'
-  require 'awesome_print'
-  require File.expand_path('../support/custom_matchers', __FILE__)
-  require File.expand_path('../support/reset-singleton', __FILE__)
+require 'rspec'
+require 'capybara/rspec'
+require 'rack/test'
+require 'database_cleaner'
+require 'awesome_print'
+require File.expand_path('../support/custom_matchers', __FILE__)
+require File.expand_path('../support/reset-singleton', __FILE__)
 
-  ENV['RACK_ENV'] = 'test'
+ENV['RACK_ENV'] = 'test'
 
-  module XhrHelpers
-    def xhr(path, params = {})
-      verb = params.delete(:as) || :get
-      send(verb,path, params, "HTTP_X_REQUESTED_WITH" => "XMLHttpRequest")
-    end
-    alias_method :ajax, :xhr
+module XhrHelpers
+  def xhr(path, params = {})
+    verb = params.delete(:as) || :get
+    send(verb,path, params, "HTTP_X_REQUESTED_WITH" => "XMLHttpRequest")
   end
+  alias_method :ajax, :xhr
+end
 
-  RSpec.configure do |c|
-    c.include Capybara::DSL
-    c.include Rack::Test::Methods
-    c.include XhrHelpers
+RSpec.configure do |c|
+  c.include Capybara::DSL
+  c.include Rack::Test::Methods
+  c.include XhrHelpers
 
-    c.before(:each) do
-      DatabaseCleaner.start
-    end
+  c.before(:each) do
+    DatabaseCleaner.start
+  end
 
-    c.after(:each) do
-      DatabaseCleaner.clean
-    end
+  c.after(:each) do
+    DatabaseCleaner.clean
+  end
 
-    c.before(:each, :ui => true) do
-      header 'User-Agent', 'Firefox'
-    end
+  c.before(:each, :ui => true) do
+    header 'User-Agent', 'Firefox'
+  end
 
-    c.before(:each, :ui => false) do
-      header 'User-Agent', nil
-    end
+  c.before(:each, :ui => false) do
+    header 'User-Agent', nil
+  end
 
-    if defined?(SimpleCov)
-      c.after(:suite) do
-        SimpleCov.result.format!
-      end
+  if defined?(SimpleCov)
+    c.after(:suite) do
+      SimpleCov.result.format!
     end
   end
-  require 'rest-assured/config'
-  DB_OPTS = { :adapter => 'mysql' }
-  RestAssured::Config.build(DB_OPTS)
+end
+require 'rest-assured/config'
+DB_OPTS = { :adapter => 'mysql' }
+RestAssured::Config.build(DB_OPTS)
 
-  require 'rest-assured'
-  require 'rest-assured/application'
-  require 'shoulda-matchers'
+require 'rest-assured'
+require 'rest-assured/application'
+require 'shoulda-matchers'
 
-  Capybara.app = RestAssured::Application
+Capybara.app = RestAssured::Application
 
-  def app
-    RestAssured::Application
-  end
-
-  DatabaseCleaner.strategy = :truncation
+def app
+  RestAssured::Application
 end
 
-Spork.each_run do
-end
+DatabaseCleaner.strategy = :truncation