spec_helper.rb in dm-adapter-simpledb-1.5.0

- old
+ new

@@ -2,11 +2,10 @@
 ROOT = File.expand_path('../..', File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(ROOT,'lib'))
 require 'simpledb_adapter'
 require 'logger'
 require 'fileutils'
-require 'right_aws'
 require 'spec'
 require 'spec/autorun'
 
 DOMAIN_FILE_MESSAGE = <<END
 !!! ATTENTION !!!
@@ -46,21 +45,19 @@
     FileUtils.touch(log_file)
     log = Logger.new(log_file)
     log.level = ::Logger::DEBUG
     DataMapper.logger.level = :debug
 
-    $control_sdb ||= RightAws::SdbInterface.new(
-      access_key, secret_key, :domain => test_domain)
-
     DataMapper.logger.set_log(log_file, :debug)
-    DataMapper.setup(:default, {
+    adapter = DataMapper.setup(:default, {
         :adapter => 'simpledb',
         :access_key => access_key,
         :secret_key => secret_key,
         :domain => test_domain,
         :logger => log,
         :wait_for_consistency => :manual
       })
+    $control_sdb = adapter.sdb_interface
   end
 
   # Run before each group
   config.before :all do
     @adapter = DataMapper::Repository.adapters[:default]