spinach 0.3.2 → 0.3.3

data/lib/spinach/capybara.rb

@@ -40,16 +40,26 @@ module Spinach
             stream.reopen(old_stream)
           end
         end
-
-        Spinach.hooks.after_scenario do
-          ::Capybara.current_session.reset! if ::Capybara.app
-          ::Capybara.use_default_driver
-        end
-
-        Spinach.hooks.on_tag('javascript') do
-          ::Capybara.current_driver = ::Capybara.javascript_driver
-        end
       end
     end
   end
 end
+
+Spinach.hooks.after_scenario do
+  ::Capybara.current_session.reset! if ::Capybara.app
+  ::Capybara.use_default_driver
+end
+
+Spinach.hooks.on_tag('javascript') do
+  ::Capybara.current_driver = ::Capybara.javascript_driver
+end
+
+open_page = Proc.new do |*args|
+  if Spinach.config.save_and_open_page_on_failure
+    step_definitions = args.last
+    step_definitions.send(:save_and_open_page)
+  end
+end
+
+Spinach.hooks.on_error_step(&open_page)
+Spinach.hooks.on_failed_step(&open_page)

data/lib/spinach/config.rb

@@ -21,7 +21,7 @@ module Spinach
   #
   class Config
     attr_writer :features_path, :step_definitions_path, :default_reporter, :support_path,
-      :failure_exceptions, :config_path
+      :failure_exceptions, :config_path, :save_and_open_page_on_failure
 
     # The "features path" holds the place where your features will be
     # searched for. Defaults to 'features'
@@ -106,6 +106,13 @@ module Spinach
       @config_path ||= 'config/spinach.yml'
     end
 
+    # When using capybara, it automatically shows the current page when there's 
+    # a failure
+    #
+    def save_and_open_page_on_failure
+      @save_and_open_page_on_failure ||= false
+    end
+
     # Parse options from the config file
     #
     # @return [Boolean]

data/lib/spinach/hooks.rb

@@ -51,14 +51,14 @@ module Spinach
     # Runs before every scenario
     #
     # @example
-    #   Spinach.hooks.before_scenario do |scenario_data|
+    #   Spinach.hooks.before_scenario do |scenario_data, step_definitions|
     #     # feature_data is a hash of the parsed scenario data
     #   end
     hook :before_scenario
 
     # Runs around every scenario
     # @example
-    #   Spinach.hooks.around_scenario do |scenario_data, &block|
+    #   Spinach.hooks.around_scenario do |scenario_data, step_definitions, &block|
     #     # feature_data is a hash of the parsed scenario data
     #     block.call
     #   end
@@ -67,7 +67,7 @@ module Spinach
     # Runs after every scenario
     #
     # @example
-    #   Spinach.hooks.after_scenario do |scenario_data|
+    #   Spinach.hooks.after_scenario do |scenario_data, step_definitions|
     #     # feature_data is a hash of the parsed scenario data
     #   end
     hook :after_scenario
@@ -75,7 +75,7 @@ module Spinach
     # Runs before every step execution
     #
     # @example
-    #   Spinach.hooks.before_step do |step_data|
+    #   Spinach.hooks.before_step do |step_data, step_definitions|
     #     # step_data contains a hash with this step's data
     #   end
     hook :before_step
@@ -83,7 +83,7 @@ module Spinach
     # Runs after every step execution
     #
     # @example
-    #   Spinach.hooks.before_step do |step_data|
+    #   Spinach.hooks.before_step do |step_data, step_definitions|
     #     # step_data contains a hash with this step's data
     #   end
     hook :after_step
@@ -91,7 +91,7 @@ module Spinach
     # Runs after every successful step execution
     #
     # @example
-    #   Spinach.hooks.on_successful_step do |step_data, location|
+    #   Spinach.hooks.on_successful_step do |step_data, location, step_definitions|
     #     # step_data contains a hash with this step's data
     #     # step_location contains a string indication this step definition's
     #     # location
@@ -101,7 +101,7 @@ module Spinach
     # Runs after every failed step execution
     #
     # @example
-    #   Spinach.hooks.on_failed_step do |step_data, location|
+    #   Spinach.hooks.on_failed_step do |step_data, exception, location, step_definitions|
     #     # step_data contains a hash with this step's data
     #     # step_location contains a string indication this step definition's
     #     # location
@@ -111,7 +111,7 @@ module Spinach
     # Runs after every step execution that raises an exception
     #
     # @example
-    #   Spinach.hooks.on_error_step do |step_data, location|
+    #   Spinach.hooks.on_error_step do |step_data, exception, location, step_definitions|
     #     # step_data contains a hash with this step's data
     #     # step_location contains a string indication this step definition's
     #     # location
@@ -121,7 +121,7 @@ module Spinach
     # Runs every time a step which is not defined is called
     #
     # @example
-    #   Spinach.hooks.on_undefined_step do |step_data, location|
+    #   Spinach.hooks.on_undefined_step do |step_data, exception, location, step_definitions|
     #     # step_data contains a hash with this step's data
     #     # step_location contains a string indication this step definition's
     #     # location
@@ -132,7 +132,7 @@ module Spinach
     # one just before.
     #
     # @example
-    #   Spinach.hooks.on_undefined_step do |step_data|
+    #   Spinach.hooks.on_undefined_step do |step_data, step_definitions|
     #     # step_data contains a hash with this step's data
     #   end
     hook :on_skipped_step

data/lib/spinach/reporter.rb

@@ -41,8 +41,8 @@ module Spinach
 
         hooks.before_feature { |*args| set_current_feature(*args) }
         hooks.after_feature { |*args| clear_current_feature(*args) }
-        hooks.before_scenario { |*args| set_current_scenario(*args) }
-        hooks.after_scenario { |*args| clear_current_scenario(*args) }
+        hooks.before_scenario { |*args| set_current_scenario(args.first) }
+        hooks.after_scenario { |*args| clear_current_scenario(args.first) }
       end
     end
 

data/lib/spinach/reporter/stdout.rb

@@ -46,7 +46,7 @@ module Spinach
       # @param [Hash] data
       #   The feature in a JSON Gherkin format
       #
-      def before_scenario_run(scenario)
+      def before_scenario_run(scenario, step_definitions = nil)
         @max_step_name_length = scenario.steps.map(&:name).map(&:length).max if scenario.steps.any?
         name = scenario.name
         out.puts "\n  #{'Scenario:'.green} #{name.light_green}"
@@ -57,7 +57,7 @@ module Spinach
       # @param [Hash] data
       #   The feature in a JSON Gherkin format
       #
-      def after_scenario_run(scenario)
+      def after_scenario_run(scenario, step_definitions = nil)
         if scenario_error
           report_error(scenario_error, :full)
           self.scenario_error = nil
@@ -72,7 +72,7 @@ module Spinach
       # @param [Array] step_location
       #   The step source location
       #
-      def on_successful_step(step, step_location)
+      def on_successful_step(step, step_location, step_definitions = nil)
         output_step('✔', step, :green, step_location)
         self.scenario = [current_feature, current_scenario, step]
         successful_steps << scenario
@@ -86,7 +86,7 @@ module Spinach
       # @param [Exception] failure
       #   The exception that caused the failure
       #
-      def on_failed_step(step, failure, step_location)
+      def on_failed_step(step, failure, step_location, step_definitions = nil)
         output_step('✘', step, :red, step_location)
         self.scenario_error = [current_feature, current_scenario, step, failure]
         failed_steps << scenario_error
@@ -100,7 +100,7 @@ module Spinach
       # @param [Exception] failure
       #   The exception that caused the failure
       #
-      def on_error_step(step, failure, step_location)
+      def on_error_step(step, failure, step_location, step_definitions = nil)
         output_step('!', step, :red, step_location)
         self.scenario_error = [current_feature, current_scenario, step, failure]
         error_steps << scenario_error
@@ -111,7 +111,7 @@ module Spinach
       # @param [Hash] step
       #   The step in a JSON Gherkin format
       #
-      def on_undefined_step(step, failure)
+      def on_undefined_step(step, failure, step_definitions = nil)
         output_step('?', step, :yellow)
         self.scenario_error = [current_feature, current_scenario, step, failure]
         undefined_steps << scenario_error
@@ -145,7 +145,7 @@ module Spinach
       # @param [Hash] step
       #   The step that Gherkin extracts
       #
-      def on_skipped_step(step)
+      def on_skipped_step(step, step_definitions = nil)
         output_step('~', step, :cyan)
       end
 

data/lib/spinach/runner/scenario_runner.rb

@@ -43,24 +43,24 @@ module Spinach
       #
       # @api public
       def run
-        Spinach.hooks.run_before_scenario @scenario
+        Spinach.hooks.run_before_scenario @scenario, step_definitions
         scenario_run = false
-        Spinach.hooks.run_around_scenario @scenario do
+        Spinach.hooks.run_around_scenario @scenario, step_definitions do
           scenario_run = true
           steps.each do |step|
-            Spinach.hooks.run_before_step step
+            Spinach.hooks.run_before_step step, step_definitions
 
             if @exception
-              Spinach.hooks.run_on_skipped_step step
+              Spinach.hooks.run_on_skipped_step step, step_definitions
             else
               run_step(step)
             end
 
-            Spinach.hooks.run_after_step step
+            Spinach.hooks.run_after_step step, step_definitions
           end
         end
         raise "around_scenario hooks *must* yield" if !scenario_run && !@exception
-        Spinach.hooks.run_after_scenario @scenario
+        Spinach.hooks.run_after_scenario @scenario, step_definitions
         !@exception
       end
 
@@ -73,16 +73,16 @@ module Spinach
       def run_step(step)
         step_location = step_definitions.step_location_for(step.name)
         step_definitions.execute(step)
-        Spinach.hooks.run_on_successful_step step, step_location
+        Spinach.hooks.run_on_successful_step step, step_location, step_definitions
       rescue *Spinach.config[:failure_exceptions] => e
         @exception = e
-        Spinach.hooks.run_on_failed_step step, @exception, step_location
+        Spinach.hooks.run_on_failed_step step, @exception, step_location, step_definitions
       rescue Spinach::StepNotDefinedException => e
         @exception = e
-        Spinach.hooks.run_on_undefined_step step, @exception
+        Spinach.hooks.run_on_undefined_step step, @exception, step_definitions
       rescue Exception => e
         @exception = e
-        Spinach.hooks.run_on_error_step step, @exception, step_location
+        Spinach.hooks.run_on_error_step step, @exception, step_location, step_definitions
       end
 
     end

data/lib/spinach/version.rb

@@ -1,4 +1,4 @@
 module Spinach
   # Spinach version.
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/test/spinach/capybara_test.rb

@@ -17,18 +17,24 @@ describe Spinach::FeatureSteps::Capybara do
 
     Capybara.app = @sinatra_app
 
-    @feature = Class.new(Spinach::FeatureSteps) do
+    class TestFeature < Spinach::FeatureSteps
       include Spinach::FeatureSteps::Capybara
       feature 'A test feature'
       Given 'Hello' do
       end
       Then 'Goodbye' do
       end
+      Given 'Fail' do
+        1.must_equal 2
+      end
       def go_home
         visit '/'
         page
       end
-    end.new
+    end
+
+    @feature_class = TestFeature
+    @feature = @feature_class.new
   end
 
   let(:parsed_feature) { Spinach::Parser.new("""
@@ -44,8 +50,15 @@ Feature: A test feature
 """).parse
   }
 
+  let(:failing_feature) { Spinach::Parser.new("""
+Feature: A test feature
+  Scenario: A test scenario
+    Given Fail
+""").parse
+  }
+
   it 'includes capybara into all features' do
-    @feature.kind_of? Capybara
+    @feature.kind_of?(Capybara::DSL).must_equal true
   end
 
   it 'goes to a capybara page and returns its result' do
@@ -77,4 +90,20 @@ Feature: A test feature
 
     @feature_runner.run
   end
+
+  describe "when there's a failure" do
+    it 'saves and open the page if the option is activated' do
+      @feature_runner = Spinach::Runner::FeatureRunner.new(failing_feature)
+      Spinach.config.save_and_open_page_on_failure = true
+      @feature_class.any_instance.expects(:save_and_open_page).once
+      @feature_runner.run
+    end
+    
+    it "doesn't saves and open the page if the option is deactivated" do
+      @feature_runner = Spinach::Runner::FeatureRunner.new(failing_feature)
+      Spinach.config.save_and_open_page_on_failure = false
+      Capybara.expects(:save_and_open_page).never
+      @feature_runner.run
+    end
+  end
 end

data/test/spinach/reporter/stdout_test.rb

@@ -72,6 +72,7 @@ describe Spinach::Reporter::Stdout do
   describe '#on_successful_step' do
     let(:step) { stub(keyword: 'Given', name: 'I am too cool') }
     let(:step_location){['error_step_location', 1]}
+    let(:step_definitions){ stub }
     it 'adds the step to the output buffer' do
       @reporter.on_successful_step(step, step_location)
 

data/test/spinach/runner/scenario_runner_test.rb

@@ -13,6 +13,7 @@ module Spinach
       end
 
       subject { ScenarioRunner.new(scenario) }
+      let(:step_definitions){ subject.step_definitions }
 
       describe 'delegations' do
         it 'delegates #feature to the scenario' do
@@ -38,18 +39,18 @@ module Spinach
             hooks = sequence('hooks')
             subject.stubs(:step_definitions).returns step_definitions = stub
 
-            Spinach.hooks.expects(:run_before_scenario).with(scenario).in_sequence(hooks)
-            Spinach.hooks.expects(:run_around_scenario).with(scenario).in_sequence(hooks).yields
+            Spinach.hooks.expects(:run_before_scenario).with(scenario, step_definitions).in_sequence(hooks)
+            Spinach.hooks.expects(:run_around_scenario).with(scenario, step_definitions).in_sequence(hooks).yields
 
-            Spinach.hooks.expects(:run_before_step).with(steps.first).in_sequence(hooks)
+            Spinach.hooks.expects(:run_before_step).with(steps.first, step_definitions).in_sequence(hooks)
             subject.expects(:run_step).with(steps.first)
-            Spinach.hooks.expects(:run_after_step).with(steps.first).in_sequence(hooks)
+            Spinach.hooks.expects(:run_after_step).with(steps.first, step_definitions).in_sequence(hooks)
 
-            Spinach.hooks.expects(:run_before_step).with(steps.last).in_sequence(hooks)
+            Spinach.hooks.expects(:run_before_step).with(steps.last, step_definitions).in_sequence(hooks)
             subject.expects(:run_step).with(steps.last)
-            Spinach.hooks.expects(:run_after_step).with(steps.last).in_sequence(hooks)
+            Spinach.hooks.expects(:run_after_step).with(steps.last, step_definitions).in_sequence(hooks)
 
-            Spinach.hooks.expects(:run_after_scenario).with(scenario).in_sequence(hooks)
+            Spinach.hooks.expects(:run_after_scenario).with(scenario, step_definitions).in_sequence(hooks)
 
             subject.run
           end
@@ -57,7 +58,7 @@ module Spinach
           it 'raises if around hook does not yield' do
             subject.stubs(:step_definitions).returns stub
 
-            Spinach.hooks.stubs(:run_around_scenario).with(scenario)
+            Spinach.hooks.stubs(:run_around_scenario).with(scenario, step_definitions)
 
             proc do
               subject.run
@@ -77,7 +78,7 @@ module Spinach
         describe 'when the step is successful' do
           it 'runs the successful hooks' do
             @step_definitions.stubs(:execute).with(@step).returns true
-            Spinach.hooks.expects(:run_on_successful_step).with(@step, @location)
+            Spinach.hooks.expects(:run_on_successful_step).with(@step, @location, @step_definitions)
 
             subject.run_step(@step)
           end
@@ -96,7 +97,7 @@ module Spinach
           end
 
           it 'runs the failed hooks' do
-            Spinach.hooks.expects(:run_on_failed_step).with(@step, kind_of(@failure_exception), @location)
+            Spinach.hooks.expects(:run_on_failed_step).with(@step, kind_of(@failure_exception), @location, @step_definitions)
             subject.run_step(@step)
           end
         end
@@ -112,7 +113,7 @@ module Spinach
           end
 
           it 'runs the undefined hooks' do
-            Spinach.hooks.expects(:run_on_undefined_step).with(@step, kind_of(Spinach::StepNotDefinedException))
+            Spinach.hooks.expects(:run_on_undefined_step).with(@step, kind_of(Spinach::StepNotDefinedException), @step_definitions)
             subject.run_step(@step)
           end
         end
@@ -128,7 +129,7 @@ module Spinach
           end
 
           it 'runs the error hooks' do
-            Spinach.hooks.expects(:run_on_error_step).with(@step, kind_of(StandardError), @location)
+            Spinach.hooks.expects(:run_on_error_step).with(@step, kind_of(StandardError), @location, @step_definitions)
             subject.run_step(@step)
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spinach
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-20 00:00:00.000000000 Z
+date: 2012-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gherkin-ruby
-  requirement: &70349778016000 !ruby/object:Gem::Requirement
+  requirement: &2160936860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -24,10 +24,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70349778016000
+  version_requirements: *2160936860
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &70349778019280 !ruby/object:Gem::Requirement
+  requirement: &2160936440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70349778019280
+  version_requirements: *2160936440
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70349777935200 !ruby/object:Gem::Requirement
+  requirement: &2160935980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70349777935200
+  version_requirements: *2160935980
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70349777559000 !ruby/object:Gem::Requirement
+  requirement: &2160935560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70349777559000
+  version_requirements: *2160935560
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70349777661240 !ruby/object:Gem::Requirement
+  requirement: &2160935140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70349777661240
+  version_requirements: *2160935140
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70349773533380 !ruby/object:Gem::Requirement
+  requirement: &2160934700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70349773533380
+  version_requirements: *2160934700
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &70349773504080 !ruby/object:Gem::Requirement
+  requirement: &2160934280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +90,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70349773504080
+  version_requirements: *2160934280
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70349773438720 !ruby/object:Gem::Requirement
+  requirement: &2160933860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,10 +101,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70349773438720
+  version_requirements: *2160933860
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70349773411420 !ruby/object:Gem::Requirement
+  requirement: &2160933420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -112,10 +112,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70349773411420
+  version_requirements: *2160933420
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70349773406720 !ruby/object:Gem::Requirement
+  requirement: &2160933000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -123,10 +123,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70349773406720
+  version_requirements: *2160933000
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70349773405900 !ruby/object:Gem::Requirement
+  requirement: &2160932580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -134,10 +134,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70349773405900
+  version_requirements: *2160932580
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70349773405100 !ruby/object:Gem::Requirement
+  requirement: &2160932080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -145,10 +145,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70349773405100
+  version_requirements: *2160932080
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70349773404240 !ruby/object:Gem::Requirement
+  requirement: &2160931660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -156,7 +156,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70349773404240
+  version_requirements: *2160931660
 description: Spinach is a BDD framework on top of gherkin
 email:
 - info@codegram.com
@@ -268,15 +268,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3946527158097990849
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3946527158097990849
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Spinach is a BDD framework on top of gherkin