turnip_formatter 0.6.0.pre.beta.4 → 0.6.0.pre.beta.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67feb08897f64d961ba76a513c0db5b4b133c0d6
-  data.tar.gz: 923976e4503e4588819f9adc5b625e89505990b5
+  metadata.gz: baf4114e2e982e5788654b0cdd6f72d7a7a3af99
+  data.tar.gz: 0444ef49fdcc2d624319a8b5b40e783cc08c5a31
 SHA512:
-  metadata.gz: 41bc4fcec63fb4ef824d976b5f6c51f12f05d985716755fe1c1e6ee03cbab1ba7a5c00f007735c982d58b02d173f201bb2f7f2593356d508b7477995b7f3ff8f
-  data.tar.gz: 8a451d6cc4471516b21499385e7300c2decccc554a652fc9d614eec35323db7b1a0b70ade4b7c014b6092e231a790f4d19ed0c45196dfecae8aec5976525d0da
+  metadata.gz: f42fa830ffaf90f70ab06b8ce582a2499b0366381d04d1615a71c2ff732b571bd7b8bde4163e7cff15e88e2a7332838f231390ba1014658fd8b0cab7ff05c273
+  data.tar.gz: 0e0de0bae97e4fe1e7fe367ae8ae7721622e1f2b9b06fee8a610efbbb10e74386e314e11f1e3d7382a8fed387ee3c7d3319967e2ce6c209766a058552536662f

data/.travis.yml

@@ -10,7 +10,6 @@ branches:
 
 matrix:
   allow_failures:
-    - gemfile: gemfiles/Gemfile-rspec-3.2.x
     - rvm: ruby-head
 
 rvm:
@@ -24,6 +23,5 @@ script:
   - bundle exec rake test
 
 gemfile:
-  - gemfiles/Gemfile-rspec-3.2.x
   - gemfiles/Gemfile-rspec-3.3.x
   - gemfiles/Gemfile-rspec-3.4.x

data/example/spec/features/argument.feature

@@ -0,0 +1,15 @@
+Feature: A feature with argument
+  Scenario: This is a feature with DocString
+    When the monster sings the following song
+    """
+    Oh here be monsters
+    This is cool
+    """
+    Then the song should have 2 lines
+
+  Scenario: This is a feature with DocTable
+    When there are monsters:
+      | gargoyle   |
+      | Cockatrice |
+    Then there should be 2 monsters
+

data/example/spec/features/{battle2.feature → background.feature}

@@ -10,15 +10,18 @@ Feature: Battle a monster with weapon
       And Fanfare
 
   Scenario: strong monster
+
+    His attacks can defeat strong monster if has weapon.
+
     Given there is a strong monster
      When I attack it
      Then it should die
       And Fanfare
- 
-  Scenario: boss monster
 
-    This scenario will error
-    So, fanfare is not...oh...
+  Scenario: [ERROR] boss monster
+
+    This scenario will not success.
+    Because his attacks can't defeat boss monster even if has weapon.
 
     Given there is a boss monster
      When I attack it

data/example/spec/features/{battle.feature → basic.feature}

@@ -6,19 +6,18 @@ Feature: Battle a monster
      Then it should die
       And Fanfare
 
-  Scenario: strong monster
+  Scenario: [ERROR] strong monster
 
-    This scenario will error
-    So, fanfare is not...oh...
+    This scenario will not success because his attacks can't defeat strong monster
 
     Given there is a strong monster
      When I attack it
      Then it should die
       And Fanfare
 
-  Scenario: spell magic
+  Scenario: [PENDING] spell magic
 
-    This scenario will error because he can't cast spell
+    This scenario will not success because he can't cast spell
 
     Given there is a strong monster
      When I cast a spell 'fireball'
@@ -27,7 +26,9 @@ Feature: Battle a monster
       And Fanfare
 
   @magician
-  Scenario: spell magic 
+  Scenario: spell magic
+
+    `magician` can cast spell.
 
     Given there is a strong monster
      When I cast a spell 'fireball'

data/example/spec/features/rspec_hooks.feature

@@ -0,0 +1,22 @@
+Feature: Battle a monster with hooks
+
+  @before_hook_error
+  Scenario: [ERROR] Error in before hook
+    Given there is a monster
+     When I attack it
+     Then it should die
+      And Fanfare
+
+  @after_hook_error
+  Scenario: [ERROR] Error in after hook
+    Given there is a monster
+     When I attack it
+     Then it should die
+      And Fanfare
+
+  @after_hook_error
+  Scenario: [ERROR] Error in steps and after hook
+    Given there is a strong monster
+     When I attack it
+     Then it should die
+      And Fanfare

data/example/spec/spec_helper.rb

@@ -6,6 +6,16 @@ end
 
 Dir.glob(File.dirname(__FILE__) + '/steps/**/*steps.rb') { |f| load f, true }
 
+RSpec.configure do |config|
+  config.before(:example, before_hook_error: true) do
+    undefined_method # NameError
+  end
+
+  config.after(:example, after_hook_error: true) do
+    expect(true).to be false # RSpec Matcher Error
+  end
+end
+
 # TurnipFormatter.configure do |config|
 #   config.title = 'My Report'
 #   config.add_stylesheet File.dirname(__FILE__) + '/foo.css'

data/example/spec/steps/steps.rb

@@ -32,6 +32,10 @@ step "there are monsters:" do |monsters|
   @monsters = monsters.map { |row| row[0] }
 end
 
+step "there should be :count monsters" do |count|
+  @monsters.length.should eq(count.to_i)
+end
+
 step "the monster sings the following song" do |song|
   @song = song
 end

data/lib/rspec/core/formatters/turnip_formatter.rb

@@ -15,9 +15,10 @@ module RSpec
 
         Formatters.register self, :example_passed, :example_pending, :example_failed, :dump_summary
 
-        def self.formatted_backtrace(example)
+        def self.formatted_backtrace(example, exception = nil)
+          exception = example.exception if exception.nil?
           formatter = RSpec.configuration.backtrace_formatter
-          formatter.format_backtrace(example.exception.backtrace, example.metadata)
+          formatter.format_backtrace(exception.backtrace, example.metadata)
         end
 
         def initialize(output)

data/lib/turnip_formatter/resource/hook.rb

@@ -0,0 +1,30 @@
+module TurnipFormatter
+  module Resource
+    class Hook
+      attr_reader :example
+      attr_reader :keyword
+      attr_reader :status
+
+      #
+      # @param  [RSpec::Core::Example]  example
+      #
+      def initialize(example, keyword, status)
+        @example = example
+        @keyword = keyword
+        @status = status
+      end
+
+      def text
+        ''
+      end
+
+      def line
+        -1
+      end
+
+      def argument
+        nil
+      end
+    end
+  end
+end

data/lib/turnip_formatter/resource/scenario/failure.rb

@@ -1,9 +1,12 @@
 require 'turnip_formatter/resource/scenario/base'
+require 'turnip_formatter/resource/hook'
 
 module TurnipFormatter
   module Resource
     module Scenario
       class Failure < Base
+        alias :super_steps :steps
+
         #
         # Return steps
         #
@@ -19,11 +22,40 @@ module TurnipFormatter
         #   #<Step 'baz'>.status = :failed
         #   #<Step 'piyo'>.status = :unexecute
         #
+        # @TODO Correspond to multiple errors.
+        #
+        # example:
         #
-        # @todo failed_at_before_hook, failed_at_after_hook GH-67
+        #   # foo.feature
+        #   @after_hook
+        #   When foo
+        #    And bar  <= failed line
+        #   Then baz
+        #
+        #   # spec_helper.rb
+        #   RSpec.configure do |config|
+        #     config.after(:example, after_hook: true) do
+        #       raise RuntimeError
+        #     end
+        #   end
+        #
+        # Currently, display only first error (`And bar`).
         #
         def steps
-          steps = super
+          case
+          when error_in_steps?
+            steps_with_error
+          when error_in_before_hook?
+            steps_with_error_in_before_hook
+          when error_in_after_hook?
+            steps_with_error_in_after_hook
+          end
+        end
+
+        private
+
+        def steps_with_error
+          steps = super_steps
 
           arys = steps.group_by { |s| (s.line <=> failed_line_number).to_s }
           arys['-1'].each { |s| s.status = :passed    } unless arys['-1'].nil?
@@ -33,17 +65,52 @@ module TurnipFormatter
           steps
         end
 
-        private
+        def steps_with_error_in_before_hook
+          steps = super_steps
+
+          steps.each { |s| s.status = :unexecute }
+          [TurnipFormatter::Resource::Hook.new(example, 'BeforeHook', :failed)] + steps
+        end
+
+        def steps_with_error_in_after_hook
+          super_steps + [TurnipFormatter::Resource::Hook.new(example, 'AfterHook', :failed)]
+        end
+
+        def error_in_steps?
+          !failed_line_number.nil?
+        end
+
+        def error_in_before_hook?
+          exception.backtrace.any? do |backtrace|
+            backtrace.match(/run_before_example/)
+          end
+        end
+
+        def error_in_after_hook?
+          exception.backtrace.any? do |backtrace|
+            backtrace.match(/run_after_example/)
+          end
+        end
 
         def failed_line_number
           @failed_line_number ||= (
             filepath = File.basename(feature_file_path)
-            line = example.exception.backtrace.find do |backtrace|
+            line = exception.backtrace.find do |backtrace|
               backtrace.match(/#{filepath}:(\d+)/)
             end
             Regexp.last_match[1].to_i if line
           )
         end
+
+        def exception
+          @exception ||= (
+            if example.exception.is_a?(RSpec::Core::MultipleExceptionError)
+              example.exception.all_exceptions.first
+            else
+              example.exception
+            end
+          )
+        end
       end
     end
   end

data/lib/turnip_formatter/step_template/base.rb

@@ -30,8 +30,8 @@ module TurnipFormatter
         end
       end
 
-      def formatted_backtrace(example)
-        RSpec::Core::Formatters::TurnipFormatter.formatted_backtrace(example)
+      def formatted_backtrace(example, exception = nil)
+        RSpec::Core::Formatters::TurnipFormatter.formatted_backtrace(example, exception)
       end
     end
   end

data/lib/turnip_formatter/step_template/exception.rb

@@ -28,7 +28,13 @@ module TurnipFormatter
       # @param  [RSpec::Core::Example]  example
       #
       def build_failed(example)
-        build(example.exception.to_s, formatted_backtrace(example))
+        exception = example.exception
+
+        if example.exception.is_a?(RSpec::Core::MultipleExceptionError)
+          exception = example.exception.all_exceptions.first
+        end
+
+        build(exception.to_s, formatted_backtrace(example, exception))
       end
 
       #
@@ -40,13 +46,13 @@ module TurnipFormatter
 
       private
 
-        def build(message, backtrace)
-          template_step_exception.render(Object.new, { message: message, backtrace: backtrace })
-        end
+      def build(message, backtrace)
+        template_step_exception.render(Object.new, { message: message, backtrace: backtrace })
+      end
 
-        def template_step_exception
-          @template_step_exception ||= Slim::Template.new(File.dirname(__FILE__) + "/exception.slim")
-        end
+      def template_step_exception
+        @template_step_exception ||= Slim::Template.new(File.dirname(__FILE__) + "/exception.slim")
+      end
     end
   end
 end

data/lib/turnip_formatter/step_template/source.rb

@@ -38,7 +38,13 @@ module TurnipFormatter
       private
 
       def location(example)
-        formatted_backtrace(example).first
+        exception = example.exception
+
+        if example.exception.is_a?(RSpec::Core::MultipleExceptionError)
+          exception = example.exception.all_exceptions.first
+        end
+
+        formatted_backtrace(example, exception).first
       end
 
       def extractor

data/lib/turnip_formatter/version.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
 module TurnipFormatter
-  VERSION = '0.6.0-beta.4'
+  VERSION = '0.6.0-beta.5'
 end

data/test/helper.rb

@@ -71,6 +71,14 @@ module TurnipFormatter
       rspec_context.include(Turnip::RSpec::Execute)
       rspec_context.include(ExecuteWrapper)
 
+      rspec_context.before(:example, before_hook_error: true) do
+        undefined_method # NameError
+      end
+
+      rspec_context.after(:example, after_hook_error: true) do
+        expect(true).to be false # RSpec Matcher Error
+      end
+
       Turnip::RSpec.__send__(:run_feature, rspec_context, feature, filename)
       rspec_context.run(NoopObject.new)
       Turnip::RSpec.update_metadata(feature, rspec_context)

data/test/turnip_formatter/resource/scenario/test_failure.rb

@@ -5,35 +5,100 @@ module TurnipFormatter::Resource::Scenario
   class TestFailure < Test::Unit::TestCase
     include TurnipFormatter::TestHelper
 
-    def setup
-      @resource = Failure.new(scenario_example)
-    end
-
     def test_status
+      @resource = Failure.new(scenario_example)
       assert_equal(:failed, @resource.status)
     end
 
     def test_steps
+      @resource = Failure.new(scenario_example)
+
       expect = [:passed, :failed, :unexecute]
       actual = @resource.steps.map(&:status)
 
       assert_equal(expect, actual)
     end
 
+    def test_steps_has_error_in_before_hook
+      @resource = Failure.new(scenario_error_before_hook)
+
+      expect = [:failed, :unexecute, :unexecute]
+      actual = @resource.steps.map(&:status)
+
+      assert_equal(expect, actual)
+      assert_equal(TurnipFormatter::Resource::Hook, @resource.steps.first.class)
+    end
+
+    def test_steps_has_error_in_after_hook
+      @resource = Failure.new(scenario_error_after_hook)
+
+      expect = [:passed, :passed, :failed]
+      actual = @resource.steps.map(&:status)
+
+      assert_equal(expect, actual)
+      assert_equal(TurnipFormatter::Resource::Hook, @resource.steps.last.class)
+    end
+
+    def test_steps_has_error_in_steps_and_after_hook
+      @resource = Failure.new(scenario_error_step_and_after_hook)
+
+      expect = [:passed, :failed, :unexecute]
+      actual = @resource.steps.map(&:status)
+
+      assert_equal(expect, actual)
+      assert_equal(TurnipFormatter::Resource::Step, @resource.steps.last.class)
+    end
+
     private
 
     def scenario_example
-      @@scenario_example ||= (
-        feature = feature_build(<<-EOS)
-          Feature: A simple feature
-            Scenario: This is a simple feature
-              When I attack it
-              Then [ERROR] it should die
-               And I get drop items
-        EOS
-
-        run_feature(feature, '/path/to/test.feature').first
+      scenario_examples[0]
+    end
+
+    def scenario_error_before_hook
+      scenario_examples[1]
+    end
+
+    def scenario_error_after_hook
+      scenario_examples[2]
+    end
+
+    def scenario_error_step_and_after_hook
+      scenario_examples[3]
+    end
+
+    def scenario_examples
+      @@scenario_examples ||= (
+        feature = feature_build(feature_text)
+        run_feature(feature, '/path/to/test.feature')
       )
     end
+
+    def feature_text
+      <<-EOS
+        Feature: A simple feature
+          Scenario: This is a simple feature
+            When I attack it
+            Then [ERROR] it should die
+             And I get drop items
+
+          @before_hook_error
+          Scenario: Error in before hook
+            When I attack it
+            Then it should die
+
+          @after_hook_error
+          Scenario: Error in after hook
+            When I attack it
+            Then it should die
+
+          @after_hook_error
+          Scenario: Error in after hook
+            When I attack it
+            Then [ERROR] it should die
+             And I get drop items
+
+      EOS
+    end
   end
 end

data/turnip_formatter.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'turnip', '~> 3.0.0.pre.beta.4'
   spec.add_dependency 'slim'
-  spec.add_dependency 'rspec', [">=3.0", "<3.5"]
+  spec.add_dependency 'rspec', [">=3.3", "<3.5"]
 
   # For ruby >= 2.1
   spec.add_dependency 'activesupport', '~> 4.2.7'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turnip_formatter
 version: !ruby/object:Gem::Version
-  version: 0.6.0.pre.beta.4
+  version: 0.6.0.pre.beta.5
 platform: ruby
 authors:
 - Wataru MIYAGUNI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-21 00:00:00.000000000 Z
+date: 2017-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: turnip
@@ -44,7 +44,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.3'
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.5'
@@ -54,7 +54,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.3'
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.5'
@@ -208,16 +208,16 @@ files:
 - example/images/outline.png
 - example/images/pending_step.png
 - example/spec/bar.js
-- example/spec/features/battle.feature
-- example/spec/features/battle2.feature
-- example/spec/features/battle3.feature
-- example/spec/features/songs.feature
+- example/spec/features/argument.feature
+- example/spec/features/background.feature
+- example/spec/features/basic.feature
+- example/spec/features/module_and_steps_for.feature
+- example/spec/features/rspec_hooks.feature
 - example/spec/foo.css
 - example/spec/spec_helper.rb
 - example/spec/steps/escape_steps.rb
 - example/spec/steps/spell_steps.rb
 - example/spec/steps/steps.rb
-- gemfiles/Gemfile-rspec-3.2.x
 - gemfiles/Gemfile-rspec-3.3.x
 - gemfiles/Gemfile-rspec-3.4.x
 - lib/rspec/core/formatters/turnip_formatter.rb
@@ -246,6 +246,7 @@ files:
 - lib/turnip_formatter/renderer/html/views/statistics_speed.html.erb
 - lib/turnip_formatter/renderer/html/views/statistics_tag.html.erb
 - lib/turnip_formatter/renderer/html/views/step.html.erb
+- lib/turnip_formatter/resource/hook.rb
 - lib/turnip_formatter/resource/scenario/base.rb
 - lib/turnip_formatter/resource/scenario/failure.rb
 - lib/turnip_formatter/resource/scenario/pass.rb

data/example/spec/features/songs.feature

@@ -1,19 +0,0 @@
-# Based on turnip/examples
-
-Feature: A feature with multiline strings
-  Scenario: This is a feature with multiline strings
-    When the monster sings the following song
-    """
-    Oh here be monsters
-    This is cool
-    """
-    Then the song should have 2 lines
-
-  Scenario: This is a feature with multiline strings
-    When a monster sings the following song
-    """
-    Oh here be monsters
-    This is cool
-    """
-    Then the song should have 2 lines
-

data/gemfiles/Gemfile-rspec-3.2.x

@@ -1,4 +0,0 @@
-source 'http://rubygems.org'
-
-gemspec :path => '..'
-gem 'rspec', '~> 3.2.0'