spinach 0.1.5.2 → 0.1.5.3

data/README.markdown

@@ -153,10 +153,14 @@ Full hook documentation is here:
 [Spinach's hook documentation on rubydoc](http://rubydoc.info/github/codegram/spinach/master/Spinach/Hooks)
 
 
-## Wanna use it with Rails?
+## Wanna use it with Rails 3?
 
 Use [spinach-rails](http://github.com/codegram/spinach-rails)
 
+## Other rack-based frameworks
+
+Check out our [spinach-sinatra demo](https://github.com/codegram/spinach-sinatra-demo)
+
 ## Contributing
 
 You can easily contribute to Spinach. Its codebase is simple and

data/bin/spinach

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+require "bundler/setup" rescue nil
 
 begin
   require 'spinach'

data/lib/spinach/exceptions.rb

@@ -1,27 +1,4 @@
 module Spinach
-  # This class represents the exception raised when Spinach can't find a class
-  # for a feature.
-  #
-  class FeatureStepsNotFoundException < StandardError
-    # @param [Array] options
-    #   An array consisting of the missing class and the feature.
-    #
-    # @api pulic
-    def initialize(options)
-      @missing_class, @feature = options
-    end
-
-    # @return [String]
-    #   A custom message when feature steps aren't found.
-    #
-    # @api public
-    def message
-      "Could not find steps for `#{@feature}` feature"
-    end
-
-    attr_reader :missing_class
-  end
-
   # This class represents the exception raised when Spinach can't find a step
   # for a {FeatureSteps}.
   #

data/lib/spinach/generators/step_generator.rb

@@ -15,6 +15,7 @@ module Spinach
     def generate
       result = StringIO.new
       result.puts "#{@data['keyword']} '#{Spinach::Support.escape_single_commas @data['name']}' do"
+      result.puts "  raise 'step not implemented'"
       result.puts "end"
       result.string
     end

data/lib/spinach/reporter/stdout.rb

@@ -125,10 +125,9 @@ module Spinach
       # @param [Spinach::FeatureNotFoundException] exception
       #   the related exception
       #
-      def on_feature_not_found(feature, exception)
-        lines = "#{exception.message}\n"
-
+      def on_feature_not_found(feature)
         generator = Generators::FeatureGenerator.new(feature)
+        lines = "Could not find steps for `#{feature['name']}` feature\n\n"
         lines << "\nPlease create the file #{generator.filename} at #{generator.path}, with:\n\n"
 
         lines << generator.generate

data/lib/spinach/runner/feature_runner.rb

@@ -53,20 +53,19 @@ module Spinach
       # @api public
       def run
         Spinach.hooks.run_before_feature data
-
-        scenarios.each do |scenario|
-          if !@scenario_line || scenario['line'].to_s == @scenario_line
-            success = ScenarioRunner.new(feature_name, scenario).run
-            @failed = true unless success
+        if Spinach.find_feature_steps(feature_name)
+          scenarios.each do |scenario|
+            if !@scenario_line || scenario['line'].to_s == @scenario_line
+              success = ScenarioRunner.new(feature_name, scenario).run
+              @failed = true unless success
+            end
           end
+        else
+          Spinach.hooks.run_on_undefined_feature data
+          @failed = true
         end
-
-      rescue Spinach::FeatureStepsNotFoundException => e
-        Spinach.hooks.run_on_undefined_feature data, e
-        @failed = true
-      ensure
         Spinach.hooks.run_after_feature data
-        return !@failed
+        !@failed
       end
     end
   end

data/lib/spinach/runner/scenario_runner.rb

@@ -40,8 +40,6 @@ module Spinach
             begin
               step_location = feature_steps.execute_step(step['name'])
               Spinach.hooks.run_on_successful_step step, step_location
-            rescue Spinach::FeatureStepsNotFoundException => e
-              raise e
             rescue *Spinach.config[:failure_exceptions] => e
               @exception = e
               Spinach.hooks.run_on_failed_step step, @exception, step_location

data/lib/spinach/version.rb

@@ -1,4 +1,4 @@
 module Spinach
   # Spinach version.
-  VERSION = "0.1.5.2"
+  VERSION = "0.1.5.3"
 end

data/lib/spinach.rb

@@ -64,6 +64,6 @@ module Spinach
     feature_steps.detect do |feature|
       feature.feature_name.to_s == name.to_s ||
       feature.name == klass
-    end || raise(Spinach::FeatureStepsNotFoundException, [klass, name])
+    end
   end
 end

data/test/spinach/capybara_test.rb

@@ -15,6 +15,7 @@ describe Spinach::FeatureSteps::Capybara do
 
     @feature = Class.new(Spinach::FeatureSteps) do
       include Spinach::FeatureSteps::Capybara
+      feature 'A test feature'
       Given 'Hello' do
       end
       Then 'Goodbye' do

data/test/spinach/generators/feature_generator_test.rb

@@ -75,6 +75,9 @@ module Spinach::Generators
         klass = eval(result)
         feature_runner = Spinach::Runner::FeatureRunner.new(stub_everything)
         feature_runner.stubs(data: data)
+        error_count = 0
+        CheezburgerCanIHas.any_instance.
+          expects(:raise).with("step not implemented").times(6).returns(nil)
         feature_runner.run.must_equal true
       end
     end

data/test/spinach/reporter/stdout/error_reporting_test.rb

@@ -208,33 +208,48 @@ describe Spinach::Reporter::Stdout do
   end
 
   describe '#full_error' do
-    before do
-      @reporter.expects(:report_exception).with(exception).returns('Exception backtrace')
-    end
+    describe "when dealing with general errors" do
+      before do
+        @reporter.expects(:report_exception).with(exception).returns('Exception backtrace')
+      end
 
-    it 'returns the exception data' do
-      exception.expects(:backtrace).returns(['first backtrace line'])
-      output = @reporter.full_error(error)
+      it 'returns the exception data' do
+        exception.expects(:backtrace).returns(['first backtrace line'])
+        output = @reporter.full_error(error)
 
-      output.must_include 'Exception backtrace'
-    end
+        output.must_include 'Exception backtrace'
+      end
 
-    it 'returns the first backtrace line' do
-      exception.expects(:backtrace).returns(['first backtrace line'])
-      output = @reporter.full_error(error)
+      it 'returns the first backtrace line' do
+        exception.expects(:backtrace).returns(['first backtrace line'])
+        output = @reporter.full_error(error)
 
-      output.must_include 'first backtrace line'
-    end
+        output.must_include 'first backtrace line'
+      end
 
-    describe 'when the user wants to print the full backtrace' do
-      it 'prints the full backtrace' do
-        @reporter.stubs(:options).returns({backtrace: true})
-        exception.expects(:backtrace).returns(['first backtrace line', 'second backtrace line'])
+      describe 'when the user wants to print the full backtrace' do
+        it 'prints the full backtrace' do
+          @reporter.stubs(:options).returns({backtrace: true})
+          exception.expects(:backtrace).returns(['first backtrace line', 'second backtrace line'])
 
-        output = @reporter.full_error(error)
+          output = @reporter.full_error(error)
 
-        output.must_include 'first backtrace line'
-        output.must_include 'second backtrace line'
+          output.must_include 'first backtrace line'
+          output.must_include 'second backtrace line'
+        end
+      end
+    end
+
+    describe "when it's a step not defined exception" do
+      it "returns a suggestion" do
+        @exception = Spinach::StepNotDefinedException.new("foo")
+        @error = [{'name' => 'My feature'},
+          {'name' => 'A scenario'},
+          {'keyword' => 'Given', 'name' => 'foo'},
+          @exception]
+        output = @reporter.full_error(@error)
+        output.must_include "Given"
+        output.must_include "foo"
       end
     end
   end

data/test/spinach/reporter/stdout_test.rb

@@ -171,16 +171,12 @@ describe Spinach::Reporter::Stdout do
         'name' => 'This feature does not exist'
       }
       Spinach.config.stubs(:step_definitions_path).returns('my/path')
-      exception = stub(
-        message: "This is a \nmultiple line error message",
-        missing_class: "ThisFeatureDoesNotExist"
-      )
-      @reporter.on_feature_not_found(@feature, exception)
+      @reporter.on_feature_not_found(@feature)
     end
     it "outputs a message" do
+      @out.string.must_include "This feature does not exist"
       @out.string.must_include "this_feature_does_not_exist.rb"
-      @out.string.must_include "This is a"
-      @out.string.must_include "multiple line error message"
+      @out.string.must_include "ThisFeatureDoesNotExist"
       @reporter.undefined_features.must_include @feature
     end
 

data/test/spinach/runner/feature_runner_test.rb

@@ -45,6 +45,7 @@ describe Spinach::Runner::FeatureRunner do
     end
 
     it 'calls the steps as expected' do
+      Spinach.expects(:find_feature_steps).returns(true)
       seq = sequence('feature')
       3.times do
         Spinach::Runner::ScenarioRunner.
@@ -56,18 +57,21 @@ describe Spinach::Runner::FeatureRunner do
     end
 
     it 'returns true if the execution succeeds' do
+      Spinach.expects(:find_feature_steps).returns(true)
       Spinach::Runner::ScenarioRunner.any_instance.
         expects(run: true).times(3)
       subject.run.must_equal true
     end
 
     it 'returns false if the execution fails' do
+      Spinach.expects(:find_feature_steps).returns(true)
       Spinach::Runner::ScenarioRunner.any_instance.
         expects(run: false).times(3)
       subject.run.must_equal false
     end
 
     it 'calls only the given scenario' do
+      Spinach.expects(:find_feature_steps).returns(true)
       @filename = 'feature/a_cool_feature.feature:12'
       @feature = Spinach::Runner::FeatureRunner.new(@filename)
       @feature.stubs(data: {
@@ -82,16 +86,15 @@ describe Spinach::Runner::FeatureRunner do
     end
 
     it "fires a hook if the feature is not defined" do
-      data = mock
-      exception = Spinach::FeatureStepsNotFoundException.new([anything, anything])
-      subject.stubs(:scenarios).raises(exception)
+      data = stub_everything
+      Spinach.expects(:find_feature_steps).returns(false)
       subject.stubs(:data).returns(data)
       not_found_called = false
-      Spinach.hooks.on_undefined_feature do |data, exception|
-        not_found_called = [data, exception]
+      Spinach.hooks.on_undefined_feature do |data|
+        not_found_called = data
       end
       subject.run
-      not_found_called.must_equal [data, exception]
+      not_found_called.must_equal data
     end
   end
 end

data/test/spinach/runner/scenario_runner_test.rb

@@ -50,6 +50,7 @@ describe Spinach::Runner::ScenarioRunner do
 
     describe 'when throwing exceptions' do
       it 'rescues a MiniTest::Assertion' do
+        Spinach.config[:failure_exceptions] << MiniTest::Assertion
         feature_steps.expects(:execute_step).raises(MiniTest::Assertion)
         Spinach.hooks.expects("run_before_scenario").with(has_value("A cool scenario"))
         Spinach.hooks.expects("run_after_scenario").with(has_value("A cool scenario"))

data/test/spinach_test.rb

@@ -6,7 +6,7 @@ describe Spinach do
     @feature_steps2 = OpenStruct.new(feature_name: 'Slip management')
     @feature_steps3 = OpenStruct.new(feature_name: 'File attachments')
     @feature_steps4 = OpenStruct.new(name: 'UserSendsAMessage')
-    [@feature_steps1, @feature_steps2, 
+    [@feature_steps1, @feature_steps2,
       @feature_steps3, @feature_steps4].each do |feature|
       Spinach.feature_steps << feature
     end
@@ -41,10 +41,8 @@ describe Spinach do
         Spinach.find_feature_steps('User sends a message').must_equal @feature_steps4
       end
 
-      it 'raises when it cannot find the class' do
-        exception = proc {
-          Spinach.find_feature_steps('This feature does not exist')
-        }.must_raise Spinach::FeatureStepsNotFoundException
+      it 'returns nil when it cannot find the class' do
+        Spinach.find_feature_steps('This feature does not exist').must_equal nil
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spinach
 version: !ruby/object:Gem::Version
-  version: 0.1.5.2
+  version: 0.1.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-21 00:00:00.000000000Z
+date: 2011-10-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gherkin
-  requirement: &2165502840 !ruby/object:Gem::Requirement
+  requirement: &70344997199800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165502840
+  version_requirements: *70344997199800
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &2165502420 !ruby/object:Gem::Requirement
+  requirement: &70344997199380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165502420
+  version_requirements: *70344997199380
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2165502000 !ruby/object:Gem::Requirement
+  requirement: &70344997198960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165502000
+  version_requirements: *70344997198960
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2165501580 !ruby/object:Gem::Requirement
+  requirement: &70344997198540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165501580
+  version_requirements: *70344997198540
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2165501160 !ruby/object:Gem::Requirement
+  requirement: &70344997198120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165501160
+  version_requirements: *70344997198120
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2165500740 !ruby/object:Gem::Requirement
+  requirement: &70344997197700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165500740
+  version_requirements: *70344997197700
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2165500320 !ruby/object:Gem::Requirement
+  requirement: &70344997197280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +90,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165500320
+  version_requirements: *70344997197280
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &2165499900 !ruby/object:Gem::Requirement
+  requirement: &70344997196860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,10 +101,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165499900
+  version_requirements: *70344997196860
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2165499480 !ruby/object:Gem::Requirement
+  requirement: &70344997196440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -112,10 +112,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165499480
+  version_requirements: *70344997196440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2165499060 !ruby/object:Gem::Requirement
+  requirement: &70344997196020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -123,10 +123,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165499060
+  version_requirements: *70344997196020
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &2165498620 !ruby/object:Gem::Requirement
+  requirement: &70344997224000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -134,10 +134,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165498620
+  version_requirements: *70344997224000
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2165498200 !ruby/object:Gem::Requirement
+  requirement: &70344997223580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -145,10 +145,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165498200
+  version_requirements: *70344997223580
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &2165497760 !ruby/object:Gem::Requirement
+  requirement: &70344997223160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -156,7 +156,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165497760
+  version_requirements: *70344997223160
 description: Spinach is a BDD framework on top of gherkin
 email:
 - info@codegram.com
@@ -222,7 +222,6 @@ files:
 - lib/spinach/support.rb
 - lib/spinach/version.rb
 - spinach.gemspec
-- test/exceptions_test.rb
 - test/spinach/capybara_test.rb
 - test/spinach/cli_test.rb
 - test/spinach/config_test.rb
@@ -256,18 +255,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -635878256505431250
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -635878256505431250
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.6
@@ -294,7 +287,6 @@ test_files:
 - features/support/env.rb
 - features/support/error_reporting.rb
 - features/support/spinach_runner.rb
-- test/exceptions_test.rb
 - test/spinach/capybara_test.rb
 - test/spinach/cli_test.rb
 - test/spinach/config_test.rb

data/test/exceptions_test.rb

@@ -1,13 +0,0 @@
-require_relative 'test_helper'
-
-describe Spinach::FeatureStepsNotFoundException do
-  subject do
-    Spinach::FeatureStepsNotFoundException.new(['ThisFeatureDoesNotExist', 'This feature does not exist'])
-  end
-
-  describe 'message' do
-    it 'tells the user that the steps could not be found' do
-      subject.message.must_include 'Could not find steps for `This feature does not exist` feature'
-    end
-  end
-end