From 3315cf88e53f2e4ef9b0eb3b5a28338e4a35e851 Mon Sep 17 00:00:00 2001 From: Jon Rowe Date: Thu, 17 Oct 2013 16:30:10 +1100 Subject: [PATCH] switch to support gem for caller filter --- benchmarks/caller.rb | 2 +- lib/rspec/core.rb | 7 +++++-- lib/rspec/core/rake_task.rb | 2 +- spec/spec_helper.rb | 2 ++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/benchmarks/caller.rb b/benchmarks/caller.rb index 6e0367af15..6d160c8334 100644 --- a/benchmarks/caller.rb +++ b/benchmarks/caller.rb @@ -1,7 +1,7 @@ $LOAD_PATH.unshift(File.expand_path("../../lib", __FILE__)) require 'benchmark' -require 'rspec/caller_filter' +require 'rspec/support/caller_filter' n = 10000 diff --git a/lib/rspec/core.rb b/lib/rspec/core.rb index 6f010c5095..323251a043 100644 --- a/lib/rspec/core.rb +++ b/lib/rspec/core.rb @@ -11,7 +11,11 @@ require 'set' require 'time' require 'rbconfig' -require_rspec['core/caller_filter'] + +require_rspec['core/version'] + +require 'rspec/support/caller_filter' + require_rspec['core/flat_map'] require_rspec['core/filter_manager'] require_rspec['core/dsl'] @@ -35,7 +39,6 @@ require_rspec['core/shared_example_group/collection'] require_rspec['core/shared_example_group'] require_rspec['core/example_group'] -require_rspec['core/version'] module RSpec autoload :SharedContext, 'rspec/core/shared_context' diff --git a/lib/rspec/core/rake_task.rb b/lib/rspec/core/rake_task.rb index 363fd0eb22..3f34ef5d4d 100644 --- a/lib/rspec/core/rake_task.rb +++ b/lib/rspec/core/rake_task.rb @@ -1,4 +1,4 @@ -require 'rspec/core/warnings' +require 'rspec/support/warnings' require 'rake' require 'rake/tasklib' require 'shellwords' diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index a0fd0fc920..20b692c454 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -115,6 +115,8 @@ def without_env_vars(*vars) end end + require 'rspec/support/spec' + RSpec.configure do |c| # structural c.alias_it_behaves_like_to 'it_has_behavior'