spec/spec_helper.rb in couchrest_model-1.0.0.beta8 vs spec/spec_helper.rb in couchrest_model-1.0.0

@@ -1,18 +1,19 @@
+require "bundler/setup"
 require "rubygems"
-require "spec" # Satisfies Autotest and anyone else not using the Rake tasks
+require "rspec" # Satisfies Autotest and anyone else not using the Rake tasks
 
 require File.join(File.dirname(__FILE__), '..','lib','couchrest_model')
 # check the following file to see how to use the spec'd features.
 
 unless defined?(FIXTURE_PATH)
   FIXTURE_PATH = File.join(File.dirname(__FILE__), '/fixtures')
   SCRATCH_PATH = File.join(File.dirname(__FILE__), '/tmp')
 
   COUCHHOST = "http://127.0.0.1:5984"
   TESTDB    = 'couchrest-model-test'
-  TEST_SERVER    = CouchRest.new
+  TEST_SERVER    = CouchRest.new COUCHHOST
   TEST_SERVER.default_database = TESTDB
   DB = TEST_SERVER.database(TESTDB)
 end
 
 class Basic < CouchRest::Model::Base
@@ -22,10 +23,10 @@
 def reset_test_db!
   DB.recreate! rescue nil 
   DB
 end
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.before(:all) { reset_test_db! }
   
   config.after(:all) do
     cr = TEST_SERVER
     test_dbs = cr.databases.select { |db| db =~ /^#{TESTDB}/ }