RubyGems - cucumber - Versions diffs - 1.2.5 → 1.3.0 - Mend

cucumber 1.2.5 → 1.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (110) hide show

checksums.yaml +14 -6
data/.ruby-gemset +1 -0
data/.ruby-version +1 -0
data/.travis.yml +1 -0
data/.yardopts +1 -0
data/CONTRIBUTING.md +2 -2
data/History.md +38 -2
data/bin/cucumber +2 -11
data/cucumber.gemspec +3 -3
data/cucumber.yml +5 -1
data/examples/test_unit/Gemfile +4 -0
data/examples/test_unit/features/step_definitions/test_unit_steps.rb +1 -4
data/examples/watir/README.textile +2 -2
data/examples/watir/features/support/env.rb +10 -7
data/features/.cucumber/stepdefs.json +747 -1354
data/features/assertions.feature +6 -2
data/features/background.feature +3 -0
data/features/backtraces.feature +3 -3
data/features/before_hook.feature +43 -0
data/features/bootstrap.feature +14 -2
data/features/custom_formatter.feature +1 -1
data/features/drb_server_integration.feature +3 -3
data/features/formatter_callbacks.feature +2 -2
data/features/formatter_step_file_colon_line.feature +1 -1
data/features/html_formatter.feature +52 -1
data/features/json_formatter.feature +93 -7
data/features/load_path.feature +14 -0
data/features/nested_steps.feature +75 -3
data/features/nested_steps_i18n.feature +36 -0
data/features/pretty_formatter.feature +31 -0
data/features/progress_formatter.feature +31 -0
data/features/raketask.feature +51 -0
data/features/rerun_formatter.feature +1 -1
data/features/stats_formatters.feature +17 -14
data/features/step_definitions/cucumber_steps.rb +6 -4
data/features/support/env.rb +31 -4
data/features/support/feature_factory.rb +17 -0
data/features/tagged_hooks.feature +37 -195
data/features/transforms.feature +15 -15
data/gem_tasks/cucumber.rake +2 -0
data/gem_tasks/yard.rake +10 -6
data/legacy_features/README.md +14 -0
data/legacy_features/language_help.feature +3 -1
data/legacy_features/report_called_undefined_steps.feature +1 -0
data/legacy_features/snippets_when_using_star_keyword.feature +1 -0
data/legacy_features/support/env.rb +4 -0
data/lib/cucumber/ast/background.rb +35 -35
data/lib/cucumber/ast/empty_background.rb +33 -0
data/lib/cucumber/ast/examples.rb +5 -2
data/lib/cucumber/ast/feature.rb +24 -35
data/lib/cucumber/ast/features.rb +4 -1
data/lib/cucumber/ast/has_steps.rb +9 -17
data/lib/cucumber/ast/location.rb +41 -0
data/lib/cucumber/ast/scenario.rb +37 -50
data/lib/cucumber/ast/scenario_outline.rb +62 -49
data/lib/cucumber/ast/step.rb +23 -27
data/lib/cucumber/ast/step_collection.rb +16 -0
data/lib/cucumber/ast/step_invocation.rb +4 -1
data/lib/cucumber/ast/tree_walker.rb +7 -0
data/lib/cucumber/cli/configuration.rb +15 -3
data/lib/cucumber/cli/main.rb +24 -11
data/lib/cucumber/cli/options.rb +24 -16
data/lib/cucumber/configuration.rb +4 -0
data/lib/cucumber/core_ext/disable_mini_and_test_unit_autorun.rb +10 -34
data/lib/cucumber/core_ext/instance_exec.rb +4 -1
data/lib/cucumber/core_ext/proc.rb +2 -0
data/lib/cucumber/feature_file.rb +5 -12
data/lib/cucumber/formatter/console.rb +10 -0
data/lib/cucumber/formatter/gherkin_formatter_adapter.rb +4 -4
data/lib/cucumber/formatter/html.rb +7 -42
data/lib/cucumber/formatter/interceptor.rb +4 -0
data/lib/cucumber/formatter/json_pretty.rb +0 -4
data/lib/cucumber/formatter/junit.rb +8 -2
data/lib/cucumber/formatter/pretty.rb +5 -1
data/lib/cucumber/formatter/progress.rb +4 -0
data/lib/cucumber/formatter/unicode.rb +12 -25
data/lib/cucumber/formatter/usage.rb +7 -2
data/lib/cucumber/js_support/js_snippets.rb +1 -1
data/lib/cucumber/load_path.rb +13 -0
data/lib/cucumber/parser/gherkin_builder.rb +237 -81
data/lib/cucumber/platform.rb +1 -1
data/lib/cucumber/py_support/py_language.rb +1 -1
data/lib/cucumber/rake/task.rb +5 -1
data/lib/cucumber/rb_support/rb_language.rb +20 -19
data/lib/cucumber/rb_support/rb_world.rb +63 -21
data/lib/cucumber/rb_support/snippet.rb +108 -0
data/lib/cucumber/runtime.rb +1 -0
data/lib/cucumber/runtime/support_code.rb +2 -2
data/lib/cucumber/unit.rb +11 -0
data/lib/cucumber/wire_support/wire_language.rb +1 -1
data/spec/cucumber/ast/background_spec.rb +13 -6
data/spec/cucumber/ast/feature_factory.rb +20 -10
data/spec/cucumber/ast/features_spec.rb +51 -0
data/spec/cucumber/ast/scenario_outline_spec.rb +13 -7
data/spec/cucumber/ast/step_spec.rb +6 -4
data/spec/cucumber/cli/configuration_spec.rb +34 -1
data/spec/cucumber/cli/main_spec.rb +36 -26
data/spec/cucumber/cli/options_spec.rb +28 -19
data/spec/cucumber/core_ext/proc_spec.rb +13 -1
data/spec/cucumber/formatter/interceptor_spec.rb +8 -0
data/spec/cucumber/formatter/junit_spec.rb +33 -0
data/spec/cucumber/formatter/pretty_spec.rb +391 -0
data/spec/cucumber/rb_support/rb_language_spec.rb +21 -50
data/spec/cucumber/rb_support/regexp_argument_matcher_spec.rb +2 -4
data/spec/cucumber/rb_support/snippet_spec.rb +128 -0
data/spec/cucumber/step_match_spec.rb +2 -6
metadata +62 -113
data/.rvmrc +0 -1
data/features/hooks.feature +0 -59
data/legacy_features/call_steps_from_stepdefs.feature +0 -154

data/lib/cucumber/formatter/html.rb CHANGED

@@ -42,7 +42,7 @@ module Cucumber
       def before_features(features)
-        @step_count = get_step_count(features)
+        @step_count = features.step_count
         # <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
         @builder.declare!(
@@ -314,7 +314,11 @@ module Cucumber
               end
             end
           end
-          set_scenario_color_failed
+          if table_row.exception.is_a? ::Cucumber::Pending
+            set_scenario_color_pending
+          else
+            set_scenario_color_failed
+          end
         end
         if @outline_row
           @outline_row += 1
@@ -398,7 +402,7 @@ module Cucumber
       end
       def set_scenario_color(status)
-        if status == :undefined or status == :pending
+        if status.nil? or status == :undefined or status == :pending
           set_scenario_color_pending
         end
         if status == :failed
@@ -422,45 +426,6 @@ module Cucumber
         end
       end
-      def get_step_count(features)
-        count = 0
-        features = features.instance_variable_get("@features")
-        features.each do |feature|
-          #get background steps
-          if feature.instance_variable_get("@background")
-            background = feature.instance_variable_get("@background")
-            background.init
-            background_steps = background.instance_variable_get("@steps").instance_variable_get("@steps")
-            count += background_steps.size
-          end
-          #get scenarios
-          feature.instance_variable_get("@feature_elements").each do |scenario|
-            scenario.init
-            #get steps
-            steps = scenario.instance_variable_get("@steps").instance_variable_get("@steps")
-            count += steps.size
-            #get example table
-            examples = scenario.instance_variable_get("@examples_array")
-            unless examples.nil?
-              examples.each do |example|
-                example_matrix = example.instance_variable_get("@outline_table").instance_variable_get("@cell_matrix")
-                count += example_matrix.size
-              end
-            end
-            #get multiline step tables
-            steps.each do |step|
-              multi_arg = step.instance_variable_get("@multiline_arg")
-              next if multi_arg.nil?
-              matrix = multi_arg.instance_variable_get("@cell_matrix")
-              count += matrix.size unless matrix.nil?
-            end
-          end
-        end
-        return count
-      end
       def build_step(keyword, step_match, status)
         step_name = step_match.format_args(lambda{|param| %{<span class="param">#{param}</span>}})
         @builder.div(:class => 'step_name') do |div|

data/lib/cucumber/formatter/interceptor.rb CHANGED

@@ -24,6 +24,10 @@ module Cucumber
           @pipe.send(method, *args, &blk)
         end
+        def respond_to?(method, include_private=false)
+          super || @pipe.respond_to?(method, include_private)
+        end
         def self.validate_pipe(pipe)
           unless [:stdout, :stderr].include? pipe
             raise ArgumentError, '#wrap only accepts :stderr or :stdout'

data/lib/cucumber/formatter/json_pretty.rb CHANGED

@@ -1,13 +1,9 @@
-require 'multi_json'
 require 'cucumber/formatter/json'
 module Cucumber
   module Formatter
     # The formatter used for <tt>--format json_pretty</tt>
     class JsonPretty < Json
-      def after_features(features)
-        @io.write(MultiJson.dump(@obj, :pretty => true))
-      end
     end
   end
 end

data/lib/cucumber/formatter/junit.rb CHANGED

@@ -48,10 +48,10 @@ module Cucumber
           :name => @feature_name ) do
           @testsuite << @builder.target!
           @testsuite.tag!('system-out') do
-            @testsuite.cdata! @interceptedout.buffer.join
+            @testsuite.cdata! strip_control_chars(@interceptedout.buffer.join)
           end
           @testsuite.tag!('system-err') do
-            @testsuite.cdata! @interceptederr.buffer.join
+            @testsuite.cdata! strip_control_chars(@interceptederr.buffer.join)
           end
         end
@@ -166,6 +166,12 @@ module Cucumber
       def write_file(feature_filename, data)
         File.open(feature_filename, 'w') { |file| file.write(data) }
       end
+      # strip control chars from cdata, to make it safe for external parsers
+      def strip_control_chars(cdata)
+        cdata.scan(/[[:print:]\t\n\r]/).join
+      end
     end
   end
 end

data/lib/cucumber/formatter/pretty.rb CHANGED

@@ -28,6 +28,10 @@ module Cucumber
         @delayed_messages = []
       end
+      def before_features(features)
+        print_profile_information
+      end
       def after_features(features)
         print_summary(features) unless @options[:autoformat]
       end
@@ -154,7 +158,7 @@ module Cucumber
       end
       def doc_string(string)
-        return if @hide_this_step
+        return if @options[:no_multiline] || @hide_this_step
         s = %{"""\n#{string}\n"""}.indent(@indent)
         s = s.split("\n").map{|l| l =~ /^\s+$/ ? '' : l}.join("\n")
         @io.puts(format_string(s, @current_step.status))

data/lib/cucumber/formatter/progress.rb CHANGED

@@ -13,6 +13,10 @@ module Cucumber
         @runtime, @io, @options = runtime, ensure_io(path_or_io, "progress"), options
       end
+      def before_features(features)
+        print_profile_information
+      end
       def after_features(features)
         @io.puts
         @io.puts

data/lib/cucumber/formatter/unicode.rb CHANGED

@@ -25,48 +25,35 @@ if Cucumber::WINDOWS
     module WindowsOutput #:nodoc:
       def self.extended(o)
         o.instance_eval do
-          alias cucumber_print print
-          def print(*a)
+          def cucumber_preprocess_output(*a)
             if Cucumber::RUBY_1_8_7
               begin
-                cucumber_print(*Iconv.iconv(Cucumber::CODEPAGE, "UTF-8", *a.map{|a|a.to_s}))
+                *Iconv.iconv(Cucumber::CODEPAGE, "UTF-8", *a.map{|a|a.to_s})
               rescue Iconv::InvalidEncoding => e
                 STDERR.cucumber_puts("WARNING: #{e.message}")
-                cucumber_print(*a)
+                *a
               rescue Iconv::IllegalSequence => e
                 STDERR.cucumber_puts("WARNING: #{e.message}")
-                cucumber_print(*a)
+                *a
               end
             else
               begin
-                cucumber_print(*a.map{|arg| arg.to_s.encode(Encoding.default_external)})
+                *a.map{|arg| arg.to_s.encode(Encoding.default_external)}
               rescue Encoding::UndefinedConversionError => e
                 STDERR.cucumber_puts("WARNING: #{e.message}")
-                cucumber_print(*a)
+                *a
               end
             end
           end
+          alias cucumber_print print
+          def print(*a)
+            cucumber_print(cucumber_preprocess_output(*a))
+          end
           alias cucumber_puts puts
           def puts(*a)
-            if Cucumber::RUBY_1_8_7
-              begin
-                cucumber_puts(*Iconv.iconv(Cucumber::CODEPAGE, "UTF-8", *a.map{|a|a.to_s}))
-              rescue Iconv::InvalidEncoding => e
-                STDERR.cucumber_print("WARNING: #{e.message}")
-                cucumber_print(*a)
-              rescue Iconv::IllegalSequence => e
-                STDERR.cucumber_puts("WARNING: #{e.message}")
-                cucumber_puts(*a)
-              end
-            else
-              begin
-                cucumber_puts(*a.map{|arg| arg.to_s.encode(Encoding.default_external)})
-              rescue Encoding::UndefinedConversionError => e
-                STDERR.cucumber_puts("WARNING: #{e.message}")
-                cucumber_puts(*a)
-              end
-            end
+            cucumber_puts(cucumber_preprocess_output(*a))
           end
         end
       end

data/lib/cucumber/formatter/usage.rb CHANGED

@@ -17,6 +17,10 @@ module Cucumber
         @stepdef_to_match = Hash.new{|h,stepdef_key| h[stepdef_key] = []}
       end
+      def before_features(features)
+        print_profile_information
+      end
       def before_step(step)
         @step = step
         @start_time = Time.now
@@ -27,8 +31,9 @@ module Cucumber
       end
       def after_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background, file_colon_line)
-        if step_match.name.nil? # nil if it's from a scenario outline
-          stepdef_key = StepDefKey.new(step_match.step_definition.regexp_source, step_match.step_definition.file_colon_line)
+        step_definition = step_match.step_definition
+        unless step_definition.nil? # nil if it's from a scenario outline
+          stepdef_key = StepDefKey.new(step_definition.regexp_source, step_definition.file_colon_line)
           @stepdef_to_match[stepdef_key] << {
             :keyword => keyword,

data/lib/cucumber/js_support/js_snippets.rb CHANGED

@@ -4,7 +4,7 @@ module Cucumber
       PARAM_PATTERN = /"(.*?)"/
       ESCAPED_PARAM_PATTERN = '"([^\\"]*)"'
-      def snippet_text(code_keyword, step_name, multiline_arg_class)
+      def snippet_text(code_keyword, step_name, multiline_arg_class, snippet_type)
         escaped = Regexp.escape(step_name).gsub('\ ', ' ').gsub('/', '\/')
         escaped = escaped.gsub(PARAM_PATTERN, ESCAPED_PARAM_PATTERN)

data/lib/cucumber/load_path.rb ADDED

@@ -0,0 +1,13 @@
+module Cucumber
+  module LoadPath
+    def add_dirs(*dirs)
+      dirs.each do |dir|
+        $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir)
+      end
+    end
+    module_function :add_dirs
+  end
+end
+Cucumber::LoadPath.add_dirs('lib')

data/lib/cucumber/parser/gherkin_builder.rb CHANGED

@@ -1,6 +1,7 @@
 require 'cucumber/ast'
 require 'gherkin/rubify'
 require 'cucumber/ast/multiline_argument'
+require 'cucumber/ast/empty_background'
 module Cucumber
   module Parser
@@ -10,98 +11,60 @@ module Cucumber
     class GherkinBuilder
       include Gherkin::Rubify
-      def ast
-        @feature || @multiline_arg
-      end
-      def feature(feature)
-        @feature = Ast::Feature.new(
-          nil,
-          Ast::Comment.new(feature.comments.map{|comment| comment.value}.join("\n")),
-          Ast::Tags.new(nil, feature.tags),
-          feature.keyword,
-          feature.name.lstrip,
-          feature.description.rstrip,
-          []
-        )
-        @feature.gherkin_statement(feature)
-        @feature
-      end
-      def background(background)
-        @background = Ast::Background.new(
-          Ast::Comment.new(background.comments.map{|comment| comment.value}.join("\n")),
-          background.line,
-          background.keyword,
-          background.name,
-          background.description,
-          []
-        )
-        @feature.background = @background
-        @background.feature = @feature
-        @step_container = @background
-        @background.gherkin_statement(background)
-      end
-      def scenario(statement)
-        scenario = Ast::Scenario.new(
-          @background,
-          Ast::Comment.new(statement.comments.map{|comment| comment.value}.join("\n")),
-          Ast::Tags.new(nil, statement.tags),
-          statement.line,
-          statement.keyword,
-          statement.name,
-          statement.description,
-          []
-        )
-        @feature.add_feature_element(scenario)
-        @background.feature_elements << scenario if @background
-        @step_container = scenario
-        scenario.gherkin_statement(statement)
-      end
-      def scenario_outline(statement)
-        scenario_outline = Ast::ScenarioOutline.new(
-          @background,
-          Ast::Comment.new(statement.comments.map{|comment| comment.value}.join("\n")),
-          Ast::Tags.new(nil, statement.tags),
-          statement.line,
-          statement.keyword,
-          statement.name,
-          statement.description,
-          [],
-          []
-        )
-        @feature.add_feature_element(scenario_outline)
-        if @background
-          @background = @background.dup
-          @background.feature_elements << scenario_outline
-        end
-        @step_container = scenario_outline
-        scenario_outline.gherkin_statement(statement)
+      def initialize(path = 'UNKNOWN-FILE')
+        @path = path
+      end
+      def result
+        return nil unless @feature_builder
+        @feature_builder.result(language)
+      end
+      def language=(language)
+        @language = language
+      end
+      def uri(uri)
+        @path = uri
+      end
+      def feature(node)
+        @feature_builder = FeatureBuilder.new(file, node)
+      end
+      def background(node)
+        builder = BackgroundBuilder.new(file, node)
+        @feature_builder.background_builder = builder
+        @current = builder
+      end
+      def scenario(node)
+        builder = ScenarioBuilder.new(file, node)
+        @feature_builder.add_child builder
+        @current = builder
+      end
+      def scenario_outline(node)
+        builder = ScenarioOutlineBuilder.new(file, node)
+        @feature_builder.add_child builder
+        @current = builder
       end
       def examples(examples)
         examples_fields = [
+          Ast::Location.new(file, examples.line),
           Ast::Comment.new(examples.comments.map{|comment| comment.value}.join("\n")),
-          examples.line,
           examples.keyword,
           examples.name,
           examples.description,
           matrix(examples.rows)
         ]
-        @step_container.add_examples(examples_fields, examples)
+        @current.add_examples examples_fields, examples
       end
-      def step(gherkin_step)
-        step = Ast::Step.new(
-          gherkin_step.line,
-          gherkin_step.keyword,
-          gherkin_step.name,
-          Ast::MultilineArgument.from(gherkin_step.doc_string || gherkin_step.rows)
-        )
-        step.gherkin_statement(gherkin_step)
-        @step_container.add_step(step)
+      def step(node)
+        builder = StepBuilder.new(file, node)
+        @current.add_child builder
       end
       def eof
@@ -111,7 +74,12 @@ module Cucumber
         # raise "SYNTAX ERROR"
       end
-    private
+      private
+      if defined?(JRUBY_VERSION)
+        java_import java.util.ArrayList
+        ArrayList.__persistent__ = true
+      end
       def matrix(gherkin_table)
         gherkin_table.map do |gherkin_row|
@@ -123,6 +91,194 @@ module Cucumber
           row
         end
       end
+      def language
+        @language || raise("Language has not been set")
+      end
+      def file
+        if Cucumber::WINDOWS && !ENV['CUCUMBER_FORWARD_SLASH_PATHS']
+          @path.gsub(/\//, '\\')
+        else
+          @path
+        end
+      end
+      class Builder
+        def initialize(file, node)
+          @file, @node = file, node
+        end
+        private
+        def tags
+          Ast::Tags.new(nil, node.tags)
+        end
+        def location
+          Ast::Location.new(file, node.line)
+        end
+        def comment
+          Ast::Comment.new(node.comments.map{ |comment| comment.value }.join("\n"))
+        end
+        attr_reader :file, :node
+      end
+      class FeatureBuilder < Builder
+        def result(language)
+          background = background(language)
+          feature = Ast::Feature.new(
+            location,
+            background,
+            comment,
+            tags,
+            node.keyword,
+            node.name.lstrip,
+            node.description.rstrip,
+            children.map { |builder| builder.result(background, language, tags) }
+          )
+          feature.gherkin_statement(node)
+          feature.language = language
+          feature
+        end
+        def background_builder=(builder)
+          @background_builder = builder
+        end
+        def add_child(child)
+          children << child
+        end
+        def children
+          @children ||= []
+        end
+        private
+        def background(language)
+          return Ast::EmptyBackground.new unless @background_builder
+          @background ||= @background_builder.result(language)
+        end
+      end
+      class BackgroundBuilder < Builder
+        def result(language)
+          background = Ast::Background.new(
+            language,
+            location,
+            comment,
+            node.keyword,
+            node.name,
+            node.description,
+            steps(language)
+          )
+          background.gherkin_statement(node)
+          background
+        end
+        def steps(language)
+          children.map { |child| child.result(language) }
+        end
+        def add_child(child)
+          children << child
+        end
+        def children
+          @children ||= []
+        end
+      end
+      class ScenarioBuilder < Builder
+        def result(background, language, feature_tags)
+          scenario = Ast::Scenario.new(
+            language,
+            location,
+            background,
+            comment,
+            tags,
+            feature_tags,
+            node.keyword,
+            node.name,
+            node.description,
+            steps(language)
+          )
+          scenario.gherkin_statement(node)
+          scenario
+        end
+        def steps(language)
+          children.map { |child| child.result(language) }
+        end
+        def add_child(child)
+          children << child
+        end
+        def children
+          @children ||= []
+        end
+      end
+      class ScenarioOutlineBuilder < Builder
+        def result(background, language, feature_tags)
+          scenario_outline = Ast::ScenarioOutline.new(
+            language,
+            location,
+            background,
+            comment,
+            tags,
+            feature_tags,
+            node.keyword,
+            node.name,
+            node.description,
+            steps(language),
+            examples_sections
+          )
+          scenario_outline.gherkin_statement(node)
+          scenario_outline
+        end
+        def add_examples(examples_section, node)
+          @examples_sections ||= []
+          @examples_sections << [examples_section, node]
+        end
+        def steps(language)
+          children.map { |child| child.result(language) }
+        end
+        def add_child(child)
+          children << child
+        end
+        def children
+          @children ||= []
+        end
+        private
+        attr_reader :examples_sections
+      end
+      class StepBuilder < Builder
+        def result(language)
+          step = Ast::Step.new(
+            language,
+            location,
+            node.keyword,
+            node.name,
+            Ast::MultilineArgument.from(node.doc_string || node.rows)
+          )
+          step.gherkin_statement(node)
+          step
+        end
+      end
     end
   end
 end