spec/spec_helper.rb in rest-assured-0.3.2 vs spec/spec_helper.rb in rest-assured-1.0.0.rc1

@@ -2,14 +2,18 @@
 require 'spork'
 
 $:.unshift(File.expand_path('../../lib'), __FILE__)
 
 Spork.prefork do
+  require 'rspec'
   require 'capybara/rspec'
   require 'rack/test'
   require 'database_cleaner'
-  require File.expand_path('../custom_matchers', __FILE__)
+  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 = {})
@@ -21,10 +25,11 @@
 
   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
 
@@ -38,32 +43,34 @@
 
     c.before(:each, :ui => false) do
       header 'User-Agent', nil
     end
   end
-end
-
-Spork.each_run do
   require 'rest-assured/config'
-  RestAssured::Config.build(:adapter => 'mysql')
+  db_opts = { :dbuser => ENV['TRAVIS'] ? "''" : "root", :adapter => 'mysql' }
+  RestAssured::Config.build(db_opts)
 
   require 'rest-assured'
-  require 'rest-assured/client'
+  require 'rest-assured/application'
   require 'shoulda-matchers'
-  require File.expand_path('../../features/support/test-server', __FILE__)
 
-  at_exit do
-    TestServer.stop
-  end
+  RestAssured::Server.start(db_opts.merge(:port => 9876))
+end
 
-  TestServer.start(:port => 9876, :db_user => ENV['TRAVIS'] ? "''" : "root")
+Spork.each_run do
+  #require 'rest-assured/config'
+  #db_opts = { :dbuser => ENV['TRAVIS'] ? "''" : "root", :adapter => 'mysql' }
+  #RestAssured::Config.build(db_opts)
 
-  while not TestServer.up?
-    puts 'Waiting for TestServer to come up...'
-    sleep 1
-  end
+  #require 'rest-assured'
+  #require 'rest-assured/application'
+  #require 'shoulda-matchers'
 
-  RestAssured::Client.config.server_address = 'http://localhost:9876'
+  #RSpec.configure do |c|
+    #c.before(:each, "ruby-api" => true) do
+      #RestAssured::Server.start(db_opts.merge(:port => 9876))
+    #end
+  #end
 
   Capybara.app = RestAssured::Application
 
   def app
     RestAssured::Application