spec_helper.rb in riak-sessions-1.0.0.beta

- old
+ new
@@ -1,31 +1,21 @@
-# Copyright 2010 Sean Cribbs, Sonian Inc., and Basho Technologies, Inc.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'riak-client','lib'))
 
 require 'rubygems' # Use the gems path only for the spec suite
 require 'riak'
 %w{rails action_pack action_dispatch action_controller action_view}.each {|f| require f }
 require 'riak-sessions'
 require 'rspec'
 
-Dir[File.join(File.dirname(__FILE__), "support", "*.rb")].sort.each {|f| require f }
+%w[
+  ripple_session_support
+  rspec-rails-neuter
+  test_server
+].each do |file|
+  require File.join("support", file)
+end
 
 RSpec.configure do |config|
   config.mock_with :rspec
-  config.after(:each) do
-    $test_server.recycle if $test_server
-  end
 end