spec/spec_helper.rb in rest-assured-1.1.0 vs spec/spec_helper.rb in rest-assured-1.1.1

@@ -22,11 +22,10 @@
   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 'rest-assured/utils/drb_sniffer'
 
   ENV['RACK_ENV'] = 'test'
 
   module XhrHelpers
     def xhr(path, params = {})
@@ -38,11 +37,10 @@
 
   RSpec.configure do |c|
     c.include Capybara::DSL
     c.include Rack::Test::Methods
     c.include XhrHelpers
-    c.include RestAssured::Utils::DrbSniffer
 
     c.before(:each) do
       DatabaseCleaner.start
     end
 
@@ -63,24 +61,23 @@
         SimpleCov.result.format!
       end
     end
   end
   require 'rest-assured/config'
-  db_opts = { :dbuser => ENV['TRAVIS'] ? "''" : "root", :adapter => 'mysql' }
-  RestAssured::Config.build(db_opts)
+  DB_OPTS = { :dbuser => ENV['TRAVIS'] ? "''" : "root", :adapter => 'mysql' }
+  RestAssured::Config.build(DB_OPTS)
 
   require 'rest-assured'
   require 'rest-assured/application'
   require 'shoulda-matchers'
 
-  RestAssured::Server.start(db_opts.merge(:port => 9877))
-end
-
-Spork.each_run do
   Capybara.app = RestAssured::Application
 
   def app
     RestAssured::Application
   end
 
   DatabaseCleaner.strategy = :truncation
+end
+
+Spork.each_run do
 end