aslakhellesoy-cucumber 0.3.11.3 → 0.3.11.5

data/features/junit_formatter.feature

@@ -13,7 +13,7 @@ Feature: JUnit output formatter
       """
 
       """
-    And "examples/junit/tmp/TEST-One_passing_scenario__one_failing_scenario.xml" should contain XML
+    And "examples/junit/tmp/TEST-one_passing_one_failing.xml" should contain XML
       """
       <?xml version="1.0" encoding="UTF-8"?>
       <testsuite errors="0" tests="2" name="One passing scenario, one failing scenario" failures="1">
@@ -36,7 +36,7 @@ Feature: JUnit output formatter
       """
       
       """
-    And "examples/junit/tmp/TEST-Pending_step.xml" should contain XML
+    And "examples/junit/tmp/TEST-pending.xml" should contain XML
       """
       <?xml version="1.0" encoding="UTF-8"?>
       <testsuite errors="0" tests="1" name="Pending step" failures="1">
@@ -56,8 +56,8 @@ Feature: JUnit output formatter
       """
       
       """
-    And "examples/junit/tmp/TEST-One_passing_scenario__one_failing_scenario.xml" should exist
-    And "examples/junit/tmp/TEST-Pending_step.xml" should exist
+    And "examples/junit/tmp/TEST-one_passing_one_failing.xml" should exist
+    And "examples/junit/tmp/TEST-pending.xml" should exist
   
   Scenario: show correct error message if no --out is passed
     When I run cucumber --format junit features

data/features/language_from_header.feature

@@ -0,0 +1,30 @@
+Feature: Language from header
+  In order to simplify command line and
+  settings in IDEs, Cucumber should pick
+  up parser language from a header.
+  
+  Scenario: LOLCAT
+    Given a standard Cucumber project directory structure
+    And a file named "features/lolcat.feature" with:
+      """
+      # language: en-lol
+      OH HAI: STUFFING
+        B4: HUNGRY
+        MISHUN: CUKES
+          DEN KTHXBAI
+      """
+    When I run cucumber -i features/lolcat.feature
+    Then it should pass with
+      """
+      # language: en-lol
+      OH HAI: STUFFING
+
+        B4: HUNGRY # features/lolcat.feature:3
+
+        MISHUN: CUKES # features/lolcat.feature:4
+          DEN KTHXBAI # features/lolcat.feature:5
+
+      1 scenario (1 undefined)
+      1 step (1 undefined)
+
+      """

data/features/step_definitions/cucumber_steps.rb

@@ -31,8 +31,8 @@ Given /^the following profiles? (?:are|is) defined:$/ do |profiles|
   create_file('cucumber.yml', profiles)
 end
 
-Given /^I am running "([^\"]*)" in the background$/ do |command|
-  run_in_background command
+Given /^I am running spork in the background$/ do
+  run_spork_in_background
 end
 
 Given /^I am not running (?:.*) in the background$/ do

data/features/support/env.rb

@@ -75,17 +75,20 @@ class CucumberWorld
     @last_stderr = IO.read(stderr_file.path)
   end
 
-  def run_in_background(command)
+  def run_spork_in_background
     pid = fork
     in_current_dir do
       if pid
         background_jobs << pid
       else
-        #STDOUT.close
-        #STDERR.close
-        exec command
+        # STDOUT.close
+        # STDERR.close
+        spork = `which spork`.strip
+        cmd = "#{Cucumber::RUBY_BINARY} -I #{Cucumber::LIBDIR} #{spork} cuc"
+        exec cmd
       end
     end
+    sleep 0.2
   end
 
   def terminate_background_jobs

data/features/work_in_progress.feature

@@ -62,6 +62,9 @@ Feature: Cucumber --work-in-progress switch
             I fail (RuntimeError)
             ./features/step_definitions/steps.rb:2:in `/^a failing step$/'
             features/wip.feature:4:in `Given a failing step'
+      
+      Failing Scenarios:
+      cucumber features/wip.feature:3 # Scenario: Failing
 
       1 scenario (1 failed)
       1 step (1 failed)

data/lib/cucumber.rb

@@ -9,60 +9,3 @@ require 'cucumber/step_mother'
 require 'cucumber/cli/main'
 require 'cucumber/broadcaster'
 require 'cucumber/core_ext/exception'
-
-module Cucumber
-  KEYWORD_KEYS = %w{name native encoding feature background scenario scenario_outline examples given when then but}
-  
-  class << self
-    # The currently active language
-    attr_reader :lang
-    
-    def load_language(lang) #:nodoc:
-      return if @lang
-      @lang = lang
-      alias_step_definitions(lang)
-      Parser.load_parser(keyword_hash)
-    end
-
-    def language_incomplete?(lang=@lang)
-      KEYWORD_KEYS.detect{|key| keyword_hash(lang)[key].nil?}
-    end
-
-    # File mode that accounts for Ruby platform and current language
-    def file_mode(m)
-      Cucumber::RUBY_1_9 ? "#{m}:#{keyword_hash['encoding']}" : m
-    end
-
-    # Returns a Hash of the currently active
-    # language, or for a specific language if +lang+ is
-    # specified.
-    def keyword_hash(lang=@lang)
-      LANGUAGES[lang]
-    end
-
-    def scenario_keyword
-      keyword_hash['scenario'].split('|')[0] + ':'
-    end
-    
-    def alias_step_definitions(lang) #:nodoc:
-      keywords = %w{given when then and but}.map{|keyword| keyword_hash(lang)[keyword].split('|')}
-      alias_steps(keywords.flatten)
-    end
-    
-    # Sets up additional method aliases for Given, When and Then.
-    # This does *not* affect how feature files are parsed. If you
-    # want to create aliases in the parser, you have to do this in
-    # languages.yml. For example:
-    #
-    # and: And|With
-    def alias_steps(keywords)
-      keywords.each do |adverb|
-        StepMother.alias_adverb(adverb)
-        World.alias_adverb(adverb)
-      end
-    end
-  end  
-
-  # Make sure we always have English aliases
-  alias_step_definitions('en')
-end

data/lib/cucumber/ast/comment.rb

@@ -17,7 +17,7 @@ module Cucumber
       end
 
       def accept(visitor)
-        @value.split("\n").each do |line|
+        @value.strip.split("\n").each do |line|
           visitor.visit_comment_line(line.strip)
         end
       end

data/lib/cucumber/ast/feature.rb

@@ -2,12 +2,12 @@ module Cucumber
   module Ast
     # Represents the root node of a parsed feature.
     class Feature
-      attr_accessor :file
+      attr_accessor :file, :language
       attr_writer :features
       attr_reader :name
 
       def initialize(background, comment, tags, name, feature_elements)
-        @background, @comment, @tags, @name, @feature_elements = background, comment, tags, name, feature_elements
+        @background, @comment, @tags, @name, @feature_elements = background, comment, tags, name.strip, feature_elements
 
         background.feature = self if background
         @feature_elements.each do |feature_element|

data/lib/cucumber/ast/feature_element.rb

@@ -49,5 +49,9 @@ module Cucumber
     def accept_hook?(hook)
       @tags.accept_hook?(hook) || @feature.accept_hook?(hook)
     end
+    
+    def language
+      @feature.language
+    end
   end
 end

data/lib/cucumber/ast/scenario.rb

@@ -25,12 +25,14 @@ module Cucumber
         visitor.visit_tags(@tags)
         visitor.visit_scenario_name(@keyword, @name, file_colon_line(@line), source_indent(first_line_length))
 
-        skip = @background && @background.failed?
-        skip_invoke! if skip
-        visitor.step_mother.before_and_after(self, skip) do
+        background_failed = @background && @background.failed?
+        skip_invoke! if background_failed
+        skip_hooks = background_failed || @executed
+        visitor.step_mother.before_and_after(self, skip_hooks) do
           visitor.visit_steps(@steps)
         end
         visitor.visit_exception(@exception, :failed) if @exception
+        @executed = true
       end
 
       # Returns true if one or more steps failed

data/lib/cucumber/ast/scenario_outline.rb

@@ -69,7 +69,12 @@ module Cucumber
       end
 
       def visit_scenario_name(visitor, row)
-        visitor.visit_scenario_name(Cucumber.scenario_keyword, row.name, file_colon_line(row.line), source_indent(first_line_length))
+        visitor.visit_scenario_name(
+          @feature.language.scenario_keyword,
+          row.name, 
+          file_colon_line(row.line), 
+          source_indent(first_line_length)
+        )
       end
 
       def to_sexp

data/lib/cucumber/ast/step.rb

@@ -74,6 +74,10 @@ module Cucumber
         @file_colon_line ||= @feature_element.file_colon_line(@line) unless @feature_element.nil?
       end
 
+      def language
+        @feature_element.language
+      end
+
       def dom_id
         @dom_id ||= file_colon_line.gsub(/\//, '_').gsub(/\./, '_').gsub(/:/, '_')
       end

data/lib/cucumber/ast/step_invocation.rb

@@ -88,7 +88,8 @@ module Cucumber
       end
 
       def actual_keyword
-        if [Cucumber.keyword_hash['and'], Cucumber.keyword_hash['but']].index(@step.keyword) && previous
+        repeat_keywords = [language.but_keywords, language.and_keywords].flatten
+        if repeat_keywords.index(@step.keyword) && previous
           previous.actual_keyword
         else
           keyword
@@ -123,6 +124,10 @@ module Cucumber
         @step.backtrace_line
       end
 
+      def language
+        @step.language
+      end
+
       def to_sexp
         [:step_invocation, @step.line, @step.keyword, @name, (@multiline_arg.nil? ? nil : @multiline_arg.to_sexp)].compact
       end

data/lib/cucumber/cli/configuration.rb

@@ -4,15 +4,15 @@ module Cucumber
 
     class Configuration
       BUILTIN_FORMATS = {
-        'html'     => 'Cucumber::Formatter::Html',
-        'pretty'   => 'Cucumber::Formatter::Pretty',
-        'profile'  => 'Cucumber::Formatter::Profile',
-        'progress' => 'Cucumber::Formatter::Progress',
-        'rerun'    => 'Cucumber::Formatter::Rerun',
-        'usage'    => 'Cucumber::Formatter::Usage',
-        'junit'    => 'Cucumber::Formatter::Junit'
+        'html'      => 'Cucumber::Formatter::Html',
+        'pretty'    => 'Cucumber::Formatter::Pretty',
+        'profile'   => 'Cucumber::Formatter::Profile',
+        'progress'  => 'Cucumber::Formatter::Progress',
+        'rerun'     => 'Cucumber::Formatter::Rerun',
+        'usage'     => 'Cucumber::Formatter::Usage',
+        'junit'     => 'Cucumber::Formatter::Junit',
+        'tag_cloud' => 'Cucumber::Formatter::TagCloud'
       }
-      DEFAULT_FORMAT = 'pretty'
       DRB_FLAG = '--drb'
       PROFILE_SHORT_FLAG = '-p'
       PROFILE_LONG_FLAG = '--profile'
@@ -26,15 +26,21 @@ module Cucumber
 
         @paths          = []
         @options        = default_options
-
-        @active_format  = DEFAULT_FORMAT
       end
 
       def parse!(args)
-        @args = args.empty? ? args_from_profile('default') : args
+        args.concat(%w{--profile default}) if args.empty?
+        @args = args
         expand_profiles_into_args
         return if parse_drb
 
+        @args.each do |arg|
+          if arg =~ /^(\w+)=(.*)$/
+            ENV[$1] = $2
+            @args.delete(arg)
+          end
+        end
+
         @args.extend(::OptionParser::Arguable)
 
         @args.options do |opts|
@@ -69,7 +75,7 @@ module Cucumber
             end
           end
           opts.on("-f FORMAT", "--format FORMAT",
-            "How to format features (Default: #{DEFAULT_FORMAT})",
+            "How to format features (Default: pretty)",
             "Available formats: #{BUILTIN_FORMATS.keys.sort.join(", ")}",
             "FORMAT can also be the fully qualified class name of",
             "your own custom formatter. If the class isn't loaded,",
@@ -79,7 +85,7 @@ module Cucumber
             "foo/bar_zap.rb. You can place the file with this relative",
             "path underneath your features/support directory or anywhere",
             "on Ruby's LOAD_PATH, for example in a Ruby gem.") do |v|
-            @options[:formats][v] = @out_stream
+            @options[:formats] << [v, @out_stream]
             @active_format = v
           end
           opts.on("-o", "--out [FILE|DIR]",
@@ -87,7 +93,8 @@ module Cucumber
             "applies to the previously specified --format, or the",
             "default format if no format is specified. Check the specific",
             "formatter's docs to see whether to pass a file or a dir.") do |v|
-            @options[:formats][@active_format] = v
+            @options[:formats] << ['pretty', nil] if @options[:formats].empty?
+            @options[:formats][-1][1] = v
           end
           opts.on("-t TAGS", "--tags TAGS",
             "Only execute the features or scenarios with the specified tags.",
@@ -176,7 +183,7 @@ module Cucumber
           end
         end.parse!
 
-        @options[:formats]['pretty'] = @out_stream if @options[:formats].empty?
+        arrange_formats
 
         @options[:snippets] = true if !@quiet && @options[:snippets].nil?
         @options[:source]   = true if !@quiet && @options[:source].nil?
@@ -211,14 +218,6 @@ module Cucumber
         @drb
       end
 
-      def load_language
-        if Cucumber.language_incomplete?(@options[:lang])
-          list_keywords_and_exit(@options[:lang])
-        else
-          Cucumber.load_language(@options[:lang])
-        end
-      end
-
       def parse_tags(tag_string)
         tag_names = tag_string.split(",")
         excludes, includes = tag_names.partition{|tag| tag =~ /^~/}
@@ -232,7 +231,9 @@ module Cucumber
 
       def build_formatter_broadcaster(step_mother)
         return Formatter::Pretty.new(step_mother, nil, @options) if @options[:autoformat]
-        formatters = @options[:formats].map do |format, out|
+        formatters = @options[:formats].map do |format_and_out|
+          format = format_and_out[0]
+          out    = format_and_out[1]
           if String === out # file name
             unless File.directory?(out)
               out = File.open(out, Cucumber.file_mode('w'))
@@ -292,6 +293,14 @@ module Cucumber
 
     protected
 
+      def arrange_formats
+        @options[:formats] << ['pretty', @out_stream] if @options[:formats].empty?
+        @options[:formats] = @options[:formats].sort_by{|f| f[1] == @out_stream ? -1 : 1}
+        if @options[:formats].length > 1 && @options[:formats][1][1] == @out_stream
+          raise "All but one formatter must use --out, only one can print to STDOUT"
+        end
+      end
+
       def remove_excluded_files_from(files)
         files.reject! {|path| @options[:excludes].detect {|pattern| path =~ pattern } }
       end
@@ -377,6 +386,7 @@ Defined profiles in cucumber.yml:
         return @cucumber_yml
       end
 
+      # TODO: Move to Language
       def list_keywords_and_exit(lang)
         unless Cucumber::LANGUAGES[lang]
           raise("No language with key #{lang}")
@@ -398,9 +408,9 @@ Defined profiles in cucumber.yml:
         {
           :strict       => false,
           :require      => nil,
-          :lang         => 'en',
+          :lang         => nil,
           :dry_run      => false,
-          :formats      => {},
+          :formats      => [],
           :excludes     => [],
           :include_tags => [],
           :exclude_tags => [],

data/lib/cucumber/cli/main.rb

@@ -2,6 +2,7 @@ require 'optparse'
 require 'cucumber'
 require 'ostruct'
 require 'cucumber/parser'
+require 'cucumber/feature_file'
 require 'cucumber/formatter/color_io'
 require 'cucumber/cli/language_help_formatter'
 require 'cucumber/cli/configuration'
@@ -41,13 +42,11 @@ module Cucumber
             configuration.parse!(@args)
           end
         end
-        configuration.load_language
         step_mother.options = configuration.options
 
+        features = load_plain_text_features
         require_files
         enable_diffing
-      
-        features = load_plain_text_features
 
         visitor = configuration.build_formatter_broadcaster(step_mother)
         step_mother.visitor = visitor # Needed to support World#announce
@@ -63,11 +62,11 @@ module Cucumber
 
       def load_plain_text_features
         features = Ast::Features.new
-        parser = Parser::FeatureParser.new
 
         verbose_log("Features:")
         configuration.feature_files.each do |f|
-          feature = parser.parse_file(f, configuration.options)
+          feature_file = FeatureFile.new(f)
+          feature = feature_file.parse(configuration.options)
           if feature
             features.add_feature(feature)
             verbose_log("  * #{f}")