Cleanup leaked changes from refactoring

lib/mutant/strategy/rspec.rb

@@ -6,20 +6,6 @@ module Mutant
 
       KILLER = Killer::Forking.new(Killer::Rspec)
 
-      # DM2-style strategy
-      class DM2 < self
-
-        # Return filename pattern
-        #
-        # @return [Enumerable<String>]
-        #
-        # @api private
-        #
-        def spec_files(mutation)
-          ExampleLookup.run(mutation)
-        end
-      end
-
       # Run all unit specs per mutation
       class Unit < self
 
@@ -30,7 +16,7 @@ module Mutant
         # @api private
         #
         def spec_files(mutation)
-          ['spec/unit']
+          Dir['spec/unit/**/*_spec.rb']
         end
       end
 

lib/mutant/subject.rb

@@ -76,7 +76,7 @@ module Mutant
     # @api private
     #
     def identification
-      "#{context.identification}#{subtype}:#{source_path}:#{source_line}"
+      "#{subtype}:#{source_path}:#{source_line}"
     end
     memoize :identification
 

lib/mutant/subject/method.rb

@@ -42,7 +42,7 @@ module Mutant
         # @api private
         #
         def subtype
-          "#{context.name}##{node.name}"
+          "#{context.identification}##{node.name}"
         end
 
       end

spec/integration/mutant/method_matching_spec.rb

@@ -10,7 +10,7 @@ describe Mutant, 'method matching' do
   this_example = 'Mutant method matching'
 
   shared_examples_for this_example do
-    subject { p Mutant::Matcher::Method.parse(pattern).to_a }
+    subject { Mutant::Matcher::Method.parse(pattern).to_a }
 
     let(:values) { defaults.merge(expectation) }
 

spec/unit/mutant/killer/rspec/class_methods/new_spec.rb

@@ -4,9 +4,10 @@ describe Mutant::Killer::Rspec, '.new' do
 
   subject { object.new(strategy, mutation) }
 
-  let(:strategy) { mock('Strategy', :spec_files => ['foo'], :error_stream => $stderr, :output_stream => $stdout) }
-  let(:context)  { mock('Context')  }
-  let(:mutation) { mock('Mutation') }
+  let(:strategy)         { mock('Strategy', :spec_files => ['foo'], :error_stream => $stderr, :output_stream => $stdout) }
+  let(:context)          { mock('Context')                                }
+  let(:mutation)         { mock('Mutation', :subject => mutation_subject) }
+  let(:mutation_subject) { mock('Mutation Subject')                       }
 
   let(:object)  { described_class }
 

spec/unit/mutant/subject/class_methods/new_spec.rb

@@ -1,13 +0,0 @@
-require 'spec_helper'
-
-describe Mutant::Subject, '.new' do
-  subject { object.new(matcher, context, ast) }
-
-  let(:object) { described_class }
-
-  let(:matcher) { mock('Matcher') }
-  let(:context) { mock('Context') }
-  let(:ast)     { mock('AST')     }
-
-  it { should be_frozen }
-end