spec/helper.rb in toystore-0.13.1 vs spec/helper.rb in toystore-0.13.2

@@ -1,42 +1,34 @@
 $:.unshift(File.expand_path('../../lib', __FILE__))
 
 require 'pathname'
-require 'logger'
 
 root_path = Pathname(__FILE__).dirname.join('..').expand_path
 lib_path  = root_path.join('lib')
-log_path  = root_path.join('log')
-log_path.mkpath
 
 require 'rubygems'
 require 'bundler'
 
 Bundler.require(:default, :test)
 
 require 'toy'
-require 'support/constants'
-require 'support/objects'
-require 'support/identity_map_matcher'
-require 'support/name_and_number_key_factory'
-require 'support/shared_active_model_lint'
 
-Logger.new(log_path.join('test.log')).tap do |log|
-  Toy.logger = log
-end
+Dir[root_path.join("spec/support/**/*.rb")].each { |f| require f }
 
 RSpec.configure do |c|
   c.include(Support::Constants)
   c.include(Support::Objects)
   c.include(IdentityMapMatcher)
+  c.include(InstrumenterHelpers)
 
   c.fail_fast = true
   c.filter_run :focused => true
   c.alias_example_to :fit, :focused => true
   c.alias_example_to :xit, :pending => true
   c.run_all_when_everything_filtered = true
 
   c.before(:each) do
     Toy::IdentityMap.enabled = false
     Toy.key_factory = nil
+    clear_instrumenter
   end
 end