spec/spec_helper.rb in redis-store-1.0.0.beta2 vs spec/spec_helper.rb in redis-store-1.0.0.beta3

@@ -1,28 +1,39 @@
 $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "/../lib")))
 ARGV << "-b"
 require "rubygems"
 require "bundler"
 Bundler.setup
-
-#require "vendor/gems/environment"
+require "methopara" if RUBY_VERSION.match /1\.9/
 require "ostruct"
 require "spec"
 require "spec/autorun"
 require "redis"
 require "merb"
+require "i18n"
 require "rack/cache"
 require "rack/cache/metastore"
 require "rack/cache/entitystore"
 require "redis-store"
 require "active_support"
 begin
   require "action_controller/session/abstract_store" # Rails 2.3.x
 rescue LoadError
   require "action_dispatch/middleware/session/abstract_store" # Rails 3.x
-  module Rails; def self.version; "3.0.0.beta4" end end unless defined?(Rails)
+  module Rails; def self.version; "3.0.0" end end unless defined?(Rails)
 end
-require "cache/rails/redis_store"
-require "rack/session/rails"
+require "active_support/cache/redis_store"
+require "action_controller/session/redis_session_store"
 require "cache/sinatra/redis_store"
 
 $DEBUG = ENV["DEBUG"] === "true"
+
+# http://mentalized.net/journal/2010/04/02/suppress_warnings_from_ruby/
+module Kernel
+  def suppress_warnings
+    original_verbosity = $VERBOSE
+    $VERBOSE = nil
+    result = yield
+    $VERBOSE = original_verbosity
+    return result
+  end
+end