Merge pull request #155 from Ptico/master

Add support for rspec-3 beta.

.gitignore

@@ -33,6 +33,7 @@ measurements
 ## BUNDLER
 .bundle
 Gemfile.lock
+Gemfile.*.lock
 
 ## PROJECT::SPECIFIC
 /vendor

config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 18
-total_score: 811
+total_score: 808

config/reek.yml

@@ -136,4 +136,5 @@ UtilityFunction:
   - Mutant::Rspec::Strategy#configuration
   - Mutant::Rspec::Strategy#options
   - Mutant::Rspec::Strategy#world
+  - Mutant::Rspec::Strategy#rspec2
   max_helper_calls: 0

lib/mutant/rspec/killer.rb

@@ -32,8 +32,6 @@ def run
           return false
         end
 
-        reporter = RSpec::Core::Reporter.new
-
         example_groups.each do |group|
           return true unless group.run(reporter)
         end
@@ -90,6 +88,23 @@ def all_example_groups
         strategy.example_groups
       end
 
+      # Choose and memoize RSpec reporter
+      #
+      # @return [RSpec::Core::Reporter]
+      #
+      # @api private
+      #
+      def reporter
+        reporter_class = RSpec::Core::Reporter
+
+        if strategy.rspec2?
+          reporter_class.new
+        else
+          reporter_class.new(strategy.configuration)
+        end
+      end
+      memoize :reporter, freezer: :noop
+
     end # Killer
   end # Rspec
 end # Mutant

lib/mutant/rspec/strategy.rb

@@ -46,6 +46,20 @@ def example_groups
         world.example_groups
       end
 
+      # Detect RSpec 2
+      #
+      # @return [true]
+      #   when RSpec 2
+      #
+      # @return [false]
+      #   otherwise
+      #
+      # @api private
+      #
+      def rspec2?
+        RSpec::Core::Version::STRING.start_with?('2.')
+      end
+
     private
 
       # Return world
@@ -67,7 +81,7 @@ def world
       #
       def options
         options = RSpec::Core::ConfigurationOptions.new(%w(--fail-fast spec))
-        options.parse_options
+        options.parse_options if rspec2?
         options
       end
       memoize :options, freezer: :noop

mutant-rspec.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.extra_rdoc_files = %w[TODO LICENSE]
 
   gem.add_runtime_dependency('mutant', "~> #{gem.version}")
-  gem.add_runtime_dependency('rspec-core',  '~> 2.14.1')
+  gem.add_runtime_dependency('rspec-core', '>= 2.14.1', '<= 3.0.0.beta2')
 
   gem.add_development_dependency('bundler', '~> 1.3', '>= 1.3.5')
 end

spec/integration/mutant/rspec_spec.rb

@@ -4,35 +4,53 @@
 
 describe Mutant, 'rspec integration' do
 
-  around do |example|
-    Dir.chdir(TestApp.root) do
-      example.run
+  let(:base_cmd) { "bundle exec mutant -I lib --require test_app --use rspec" }
+
+  shared_examples_for 'rspec integration' do
+    around do |example|
+      Bundler.with_clean_env do
+        Dir.chdir(TestApp.root) do
+          Kernel.system("bundle install --gemfile=#{gemfile}")
+          ENV['BUNDLE_GEMFILE'] = gemfile
+          example.run
+        end
+      end
     end
-  end
 
-  let(:base_cmd) { 'bundle exec mutant -I lib --require test_app --use rspec' }
+    specify 'it allows to kill mutations' do
+      expect(Kernel.system("#{base_cmd} ::TestApp::Literal#string")).to be(true)
+    end
 
-  specify 'it allows to kill mutations' do
-    expect(Kernel.system("#{base_cmd} ::TestApp::Literal#string")).to be(true)
-  end
+    specify 'it allows to exclude mutations' do
+      cli = <<-CMD.split("\n").join(' ')
+        #{base_cmd}
+        ::TestApp::Literal#string
+        ::TestApp::Literal#uncovered_string
+          --ignore-subject ::TestApp::Literal#uncovered_string
+      CMD
+      expect(Kernel.system(cli)).to be(true)
+    end
 
-  specify 'it allows to exclude mutations' do
-    cli = <<-CMD.split("\n").join(' ')
-      #{base_cmd}
-      ::TestApp::Literal#string
-      ::TestApp::Literal#uncovered_string
-        --ignore-subject ::TestApp::Literal#uncovered_string
-    CMD
-    expect(Kernel.system(cli)).to be(true)
+    specify 'fails to kill mutations when they are not covered' do
+      cli = "#{base_cmd} ::TestApp::Literal#uncovered_string"
+      expect(Kernel.system(cli)).to be(false)
+    end
+
+    specify 'fails when some mutations are not covered' do
+      cli = "#{base_cmd} ::TestApp::Literal"
+      expect(Kernel.system(cli)).to be(false)
+    end
   end
 
-  specify 'fails to kill mutations when they are not covered' do
-    cli = "#{base_cmd} ::TestApp::Literal#uncovered_string"
-    expect(Kernel.system(cli)).to be(false)
+  context 'RSpec 2' do
+    let(:gemfile) { 'Gemfile.rspec2' }
+
+    it_behaves_like 'rspec integration'
   end
 
-  specify 'fails when some mutations are not covered' do
-    cli = "#{base_cmd} ::TestApp::Literal"
-    expect(Kernel.system(cli)).to be(false)
+  context 'Rspec 3' do
+    let(:gemfile) { 'Gemfile.rspec3' }
+
+    it_behaves_like 'rspec integration'
   end
 end

spec/unit/mutant/cli_new_spec.rb

@@ -13,9 +13,9 @@
 shared_examples_for 'a cli parser' do
   subject { cli.config }
 
-  its(:strategy) { should eql(expected_strategy) }
-  its(:reporter) { should eql(expected_reporter) }
-  its(:matcher)  { should eql(expected_matcher)  }
+  it { expect(subject.strategy).to eql(expected_strategy) }
+  it { expect(subject.reporter).to eql(expected_reporter) }
+  it { expect(subject.matcher).to  eql(expected_matcher)  }
 end
 
 describe Mutant::CLI, '.new' do

spec/unit/mutant/rspec/killer_spec.rb

@@ -42,15 +42,15 @@
   context 'when run exits zero' do
     let(:exit_status) { 0 }
 
-    its(:killed?) { should be(false) }
+    it { expect(subject.killed?).to be(false) }
 
     it { should be_a(described_class) }
   end
 
   context 'when run exits nonzero' do
     let(:exit_status) { 1 }
 
-    its(:killed?) { should be(true) }
+    it { expect(subject.killed?).to be(true) }
 
     it { should be_a(described_class) }
   end

test_app/Gemfile.rspec2

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gem 'rspec', '~> 2.14.1'
+gem 'mutant', path: '../'

test_app/Gemfile.rspec3

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+gem 'rspec', '~> 3.0.0.beta2'
+gem 'mutant', path: '../'