From 38c79dcedb246daacbadb9f18d09f50cc837de51 Mon Sep 17 00:00:00 2001 From: Brad Carson Date: Sat, 24 May 2014 15:57:57 -0400 Subject: [PATCH] replace CommandLine with Runner for RSpec 3.0.0.rc1 --- lib/spork/test_framework/rspec.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/spork/test_framework/rspec.rb b/lib/spork/test_framework/rspec.rb index d492e1c..0e9451f 100644 --- a/lib/spork/test_framework/rspec.rb +++ b/lib/spork/test_framework/rspec.rb @@ -1,3 +1,5 @@ +require 'rspec/core/version' + class Spork::TestFramework::RSpec < Spork::TestFramework DEFAULT_PORT = 8989 HELPER_FILE = File.join(Dir.pwd, "spec/spec_helper.rb") @@ -7,11 +9,19 @@ def run_tests(argv, stderr, stdout) ::Spec::Runner::CommandLine.run( ::Spec::Runner::OptionParser.parse(argv, stderr, stdout) ) + elsif rspec3? + options = ::RSpec::Core::ConfigurationOptions.new(argv) + ::RSpec::Core::Runner.new(options).run(stderr, stdout) else ::RSpec::Core::CommandLine.new(argv).run(stderr, stdout) end end + def rspec3? + return false if !defined?(::RSpec::Core::Version::STRING) + ::RSpec::Core::Version::STRING =~ /^3\./ + end + def rspec1? defined?(Spec) && !defined?(RSpec) end