Fix moar tests

features/steps/rspec_compatibility.rb

@@ -30,7 +30,7 @@ class RSpecCompatibility < Spinach::FeatureSteps
 
   When "I run \"spinach\" with rspec" do
     @feature =
-      run_feature "features/#{@feature}.feature", suite: :rspec
+      run_feature "features/#{@feature}.feature", framework: :rspec
   end
 
   Then "I should see the failure count along with their messages" do

features/support/spinach_runner.rb

@@ -15,9 +15,9 @@ def self.included(base)
     end
 
     def run_feature(command, options={})
-      options[:suite] ||= :minitest
-      use_minitest if options[:suite] == :minitest
-      use_rspec if options[:suite] == :rspec
+      options[:framework] ||= :minitest
+      use_minitest if options[:framework] == :minitest
+      use_rspec if options[:framework] == :rspec
       run "../../bin/spinach #{command} #{options[:append]}"
     end
 

lib/spinach/frameworks.rb

@@ -0,0 +1,2 @@
+require_relative 'frameworks/minitest' if defined?(MiniTest)
+require_relative 'frameworks/rspec' if defined?(RSpec::Expectations)

lib/spinach/parser.rb

@@ -11,7 +11,6 @@ class Parser
     # @api public
     def initialize(content)
       @content = content
-      @visitor = Visitor.new
     end
 
     # @param [String] filename
@@ -37,9 +36,8 @@ def self.open_file(filename)
     #
     # @api public
     def parse
-      ast     = Gherkin.parse(@content.strip)
-      feature = Feature.new
-      Visitor.new(feature).visit(ast)
+      ast = Gherkin.parse(@content.strip)
+      Visitor.new.visit(ast)
     end
   end
 end

lib/spinach/runner.rb

@@ -54,7 +54,7 @@ def initialize(filenames, options = {})
     # @api public
     def run
       require_dependencies
-      require_suites
+      require_frameworks
 
       Spinach.hooks.run_before_run
 
@@ -83,10 +83,10 @@ def require_dependencies
       end
     end
 
-    # Requires the test suite support
+    # Requires the test framework support
     #
-    def require_suites
-      require_relative 'suites'
+    def require_frameworks
+      require_relative 'frameworks'
     end
 
     # @return [Array<String>] files

test/spinach/suites/minitest_test.rb → test/spinach/frameworks/minitest_test.rb

@@ -1,8 +1,8 @@
 require_relative '../../test_helper'
 
-describe "minitest suite" do
+describe "minitest framework" do
   before do
-    require_relative '../../../lib/spinach/suites/minitest'
+    require_relative '../../../lib/spinach/frameworks/minitest'
   end
 
   it "adds MiniTest::Assertion into the failure exceptions" do

test/spinach/parser_test.rb

@@ -18,7 +18,7 @@
   describe '#parse' do
     it 'parses the file' do
       Gherkin.expects(:parse).with(@contents.strip).returns ast = stub
-      Visitor.expects(:new).with(kind_of(Feature)).returns visitor = stub
+      Spinach::Parser::Visitor.stubs(:new).returns visitor = stub
       visitor.expects(:visit).with ast
       @parser.parse
     end

test/spinach/runner/scenario_runner_test.rb

@@ -75,7 +75,7 @@ class Runner
         describe 'when the step fails' do
           before do
             @failure_exception = Class.new(StandardError)
-            Spinach.config[:failure_exceptions] = [@failure_exception]
+            Spinach.stubs(:config).returns({ failure_exceptions: [@failure_exception] })
             @step_definitions.stubs(:execute).with('Go shopping').raises @failure_exception
           end