spec_helper.rb in ripple-1.0.0.beta

- old
+ new
@@ -1,33 +1,32 @@
-# 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 'ripple'
+require 'ripple/conflict/test_helper'
 require 'rspec'
 
-Dir[File.join(File.dirname(__FILE__), "support", "*.rb")].each {|f| require f }
+# Only the tests should really get away with this.
+Riak.disable_list_keys_warnings = true
 
+%w[
+   integration_setup
+   mocks
+   test_server
+   search
+   models
+   associations
+  ].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
 
-  config.filter_run :focus => true
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.filter_run :focus
   config.run_all_when_everything_filtered = true
   config.debug = true
+  config.include Ripple::Conflict::TestHelper
 end