casecumber 1.0.2.1 → 1.2.1.cb2

data/features/step_definitions/cucumber-features/cucumber_ruby_mappings.rb

@@ -7,8 +7,8 @@ module CucumberRubyMappings
     run_simple "#{cucumber_bin} features/a_feature.feature --name '#{scenario_name}'", false
   end
 
-  def run_feature
-    run_simple "#{cucumber_bin} features/a_feature.feature", false
+  def run_feature(filename = 'features/a_feature.feature', formatter = 'progress')
+    run_simple "#{cucumber_bin} #{filename} --format #{formatter}", false
   end
 
   def cucumber_bin
@@ -54,7 +54,7 @@ EOF
   end
 
   def write_calculator_code
-        code = <<-EOF
+    code = <<-EOF
 # http://en.wikipedia.org/wiki/Reverse_Polish_notation
 class RpnCalculator
   def initialize
@@ -163,6 +163,35 @@ EOF
   def failed_output
     "failed"
   end
+
+  def run_spork_in_background(port = nil)
+    require 'spork'
+
+    pid = fork
+    in_current_dir do
+      if pid
+        background_jobs << pid
+      else
+        # STDOUT.close
+        # STDERR.close
+        port_arg = port ? "-p #{port}" : ''
+        cmd = "#{Cucumber::RUBY_BINARY} -I #{Cucumber::LIBDIR} #{Spork::BINARY} cuc #{port_arg}"
+        exec cmd
+      end
+    end
+    sleep 1.0
+  end
+
+  def background_jobs
+    @background_jobs ||= []
+  end
+
+  def terminate_background_jobs
+    background_jobs.each do |pid|
+      Process.kill(Signal.list['TERM'], pid)
+    end
+  end
+
 end
 
 World(CucumberRubyMappings)

data/features/step_definitions/cucumber_steps.rb

@@ -21,3 +21,18 @@ Given /^a directory without standard Cucumber project directory structure$/ do
     FileUtils.rm_rf 'features' if File.directory?('features')
   end
 end
+
+Given /^a scenario with a step that looks like this:$/ do |string|
+  create_feature do
+    create_scenario { string }
+  end
+end
+
+Given /^a step definition that looks like this:$/ do |string|
+  create_step_definition { string }
+end
+
+When /^I run the feature with the (\w+) formatter$/ do |formatter|
+  features.length.should == 1
+  run_feature features.first, formatter
+end

data/features/step_definitions/drb_steps.rb

@@ -0,0 +1,3 @@
+Given /^I am running spork in the background$/ do
+  run_spork_in_background
+end

data/features/support/env.rb

@@ -24,3 +24,7 @@ Before do
   # Set a longer timeout for aruba
   @aruba_timeout_seconds = 15
 end
+
+After do
+  terminate_background_jobs
+end

data/features/support/feature_factory.rb

@@ -0,0 +1,50 @@
+module FeatureFactory
+  def create_feature(name = generate_feature_name)
+    gherkin = <<-GHERKIN
+Feature: #{name}
+#{yield}
+    GHERKIN
+    write_file filename(name), gherkin
+  end
+
+  def create_scenario(name = generate_scenario_name)
+    <<-GHERKIN
+  Scenario: #{name}
+  #{yield}
+    GHERKIN
+  end
+
+  def create_step_definition
+    write_file generate_step_definition_filename, yield
+  end
+
+  def generate_feature_name
+    "Test Feature #{next_increment(:feature)}"
+  end
+
+  def generate_scenario_name
+    "Test Scenario #{next_increment(:scenario)}"
+  end
+
+  def next_increment(label)
+    @increments ||= {}
+    @increments[label] ||= 0
+    @increments[label] += 1
+  end
+
+  def generate_step_definition_filename
+    "features/step_definitions/test_steps#{next_increment(:step_defs)}.rb"
+  end
+
+  def filename(name)
+    "features/#{name.downcase.gsub(' ', '_')}.feature"
+  end
+
+  def features
+    in_current_dir do
+      Dir['features/*.feature']
+    end
+  end
+end
+
+World(FeatureFactory)

data/gem_tasks/cucumber.rake

@@ -1,21 +1,28 @@
 require 'cucumber/rake/task'
 require 'cucumber/platform'
 
+class Cucumber::Rake::Task
+  def set_profile_for_current_ruby
+    self.profile = if(Cucumber::JRUBY)
+      Cucumber::WINDOWS ? 'jruby_win' : 'jruby'
+    elsif(Cucumber::WINDOWS_MRI)
+      'windows_mri'
+    elsif(Cucumber::RUBY_1_9)
+      'ruby_1_9'
+    end
+  end
+end
+
 Cucumber::Rake::Task.new(:features) do |t|
   t.fork = false
+  t.set_profile_for_current_ruby
 end
 
 Cucumber::Rake::Task.new(:legacy_features) do |t|
   t.fork = false
   t.cucumber_opts = %w{legacy_features}
-  if(Cucumber::JRUBY)
-    t.profile = Cucumber::WINDOWS ? 'jruby_win' : 'jruby'
-  elsif(Cucumber::WINDOWS_MRI)
-    t.profile = 'windows_mri'
-  elsif(Cucumber::RUBY_1_9)
-    t.profile = 'ruby_1_9'
-  end
+  t.set_profile_for_current_ruby
   t.rcov = ENV['RCOV']
 end
 
-task :cucumber => [:features, :legacy_features]
+task :cucumber => [:features, :legacy_features]

data/gem_tasks/yard.rake

@@ -0,0 +1,18 @@
+require 'yard'
+require 'yard/rake/yardoc_task'
+require 'cucumber/platform'
+
+YARD::Templates::Engine.register_template_path(File.expand_path(File.join(File.dirname(__FILE__), 'yard')))
+YARD::Rake::YardocTask.new(:yard) do |t|
+  t.options = %w{--no-private --title Cucumber}
+  t.files = %w{lib - README.md History.md LICENSE}
+end
+
+desc "Push yardoc to http://cukes.info/cucumber/api/#{Cucumber::VERSION}"
+task :push_yard => :yard do
+  sh("tar czf api-#{Cucumber::VERSION}.tgz -C doc .")
+  sh("scp api-#{Cucumber::VERSION}.tgz cukes.info:/var/www/cucumber/api/ruby")
+  sh("ssh cukes.info 'cd /var/www/cucumber/api/ruby && rm -rf #{Cucumber::VERSION} && mkdir #{Cucumber::VERSION} && tar xzf api-#{Cucumber::VERSION}.tgz -C #{Cucumber::VERSION} && rm -f latest && ln -s #{Cucumber::VERSION} latest'")
+end
+
+#task :release => :push_yard

data/legacy_features/call_steps_from_stepdefs.feature

@@ -46,7 +46,7 @@ Feature: http://gist.github.com/221223
       end
 
       Given /^I use keyword to call a multiline string with (.*)$/ do |s| x=1
-        Given 'a multiline string:', "Hello\n#{s}"
+        step 'a multiline string:', "Hello\n#{s}"
       end
 
       Given /^I call a table with (.*)$/ do |s| x=1

data/legacy_features/cucumber_cli.feature

@@ -551,13 +551,6 @@ Feature: Cucumber command line
 
       """
 
-  # Fails on 1.9 because of encoding issues.
-  @fails_on_1_9
-  Scenario: Generate PDF with pdf formatter
-    When I run cucumber --format pdf --out tmp/sample.pdf --dry-run features/sample.feature
-    Then STDERR should be empty
-    Then "fixtures/self_test/tmp/sample.pdf" should match "Pages 2"
-
   Scenario: Run feature elements which match a name using -n
     When I run cucumber -n Pisang -q features/
     Then STDERR should be empty

data/legacy_features/default_snippets.feature

@@ -34,8 +34,9 @@ Feature: Print snippets
         pending # express the regexp above with the code you wish you had
       end
 
-      If you want snippets in a different programming language, just make sure a file
-      with the appropriate file extension exists where cucumber looks for step definitions.
+      If you want snippets in a different programming language,
+      just make sure a file with the appropriate file extension
+      exists where cucumber looks for step definitions.
 
 
       """

data/legacy_features/junit_formatter.feature

@@ -16,9 +16,11 @@ Feature: JUnit output formatter
       """
       <?xml version="1.0" encoding="UTF-8"?>
       <testsuite errors="0" failures="1" name="One passing scenario, one failing scenario" skipped="0" tests="2" time="0.005">
-      <testcase classname="One passing scenario, one failing scenario.Passing" name="Passing" time="0.005">
+      <testcase classname="One passing scenario, one failing scenario" name="Passing" time="0.005">
+        <system-out/>
+        <system-err/>
       </testcase>
-      <testcase classname="One passing scenario, one failing scenario.Failing" name="Failing" time="0.005">
+      <testcase classname="One passing scenario, one failing scenario" name="Failing" time="0.005">
         <failure message="failed Failing" type="failed">
           <![CDATA[Scenario: Failing
 
@@ -29,7 +31,15 @@ Feature: JUnit output formatter
           <![CDATA[ (RuntimeError)
 	features/one_passing_one_failing.feature:7:in `Given a failing scenario']]>
         </failure>
+        <system-out/>
+        <system-err/>
       </testcase>
+        <system-out>
+          <![CDATA[]]>
+        </system-out>
+        <system-err>
+          <![CDATA[]]>
+        </system-err>
       </testsuite>
 
       """
@@ -44,9 +54,11 @@ Feature: JUnit output formatter
       """
       <?xml version="1.0" encoding="UTF-8"?>
       <testsuite errors="0" failures="1" name="Subdirectory - One passing scenario, one failing scenario" skipped="0" tests="2" time="0.005">
-      <testcase classname="Subdirectory - One passing scenario, one failing scenario.Passing" name="Passing" time="0.005">
+      <testcase classname="Subdirectory - One passing scenario, one failing scenario" name="Passing" time="0.005">
+        <system-out/>
+        <system-err/>
       </testcase>
-      <testcase classname="Subdirectory - One passing scenario, one failing scenario.Failing" name="Failing" time="0.005">
+      <testcase classname="Subdirectory - One passing scenario, one failing scenario" name="Failing" time="0.005">
         <failure message="failed Failing" type="failed">
           <![CDATA[Scenario: Failing
 
@@ -57,7 +69,15 @@ Feature: JUnit output formatter
           <![CDATA[ (RuntimeError)
 	features/some_subdirectory/one_passing_one_failing.feature:7:in `Given a failing scenario']]>
         </failure>
+        <system-out/>
+        <system-err/>
       </testcase>
+        <system-out>
+          <![CDATA[]]>
+        </system-out>
+        <system-err>
+          <![CDATA[]]>
+        </system-err>
       </testsuite>
 
       """
@@ -72,12 +92,22 @@ Feature: JUnit output formatter
       """
       <?xml version="1.0" encoding="UTF-8"?>
       <testsuite errors="0" failures="0" name="Pending step" skipped="2" tests="2" time="0.009">
-      <testcase classname="Pending step.Pending" name="Pending" time="0.009">
+      <testcase classname="Pending step" name="Pending" time="0.009">
         <skipped/>
+        <system-out/>
+        <system-err/>
       </testcase>
-      <testcase classname="Pending step.Undefined" name="Undefined" time="0.009">
+      <testcase classname="Pending step" name="Undefined" time="0.009">
         <skipped/>
+        <system-out/>
+        <system-err/>
       </testcase>
+        <system-out>
+          <![CDATA[]]>
+        </system-out>
+        <system-err>
+          <![CDATA[]]>
+        </system-err>
       </testsuite>
       
       """
@@ -92,7 +122,7 @@ Feature: JUnit output formatter
       """
       <?xml version="1.0" encoding="UTF-8"?>
       <testsuite errors="0" failures="2" name="Pending step" skipped="0" tests="2" time="0.000160">
-      <testcase classname="Pending step.Pending" name="Pending" time="0.000160">
+      <testcase classname="Pending step" name="Pending" time="0.000160">
         <failure message="pending Pending" type="pending">
           <![CDATA[Scenario: Pending
 
@@ -100,8 +130,10 @@ Feature: JUnit output formatter
           <![CDATA[TODO (Cucumber::Pending)
       features/pending.feature:4:in `Given a pending step']]>
         </failure>
+        <system-out/>
+        <system-err/>
       </testcase>
-      <testcase classname="Pending step.Undefined" name="Undefined" time="0.000160">
+      <testcase classname="Pending step" name="Undefined" time="0.000160">
         <failure message="undefined Undefined" type="undefined">
           <![CDATA[Scenario: Undefined
       
@@ -109,7 +141,15 @@ Feature: JUnit output formatter
           <![CDATA[Undefined step: "an undefined step" (Cucumber::Undefined)
       features/pending.feature:7:in `Given an undefined step']]>
         </failure>
+        <system-out/>
+        <system-err/>
       </testcase>
+        <system-out>
+          <![CDATA[]]>
+        </system-out>
+        <system-err>
+          <![CDATA[]]>
+        </system-err>
       </testsuite>
 
       """
@@ -144,9 +184,11 @@ You \*must\* specify \-\-out DIR for the junit formatter
       """
       <?xml version="1.0" encoding="UTF-8"?>
       <testsuite errors="0" failures="1" name="Scenario outlines" skipped="0" tests="2" time="0.005">
-      <testcase classname="Scenario outlines.Using scenario outlines" name="Using scenario outlines (outline example : | passing |)" time="0.005">
+      <testcase classname="Scenario outlines" name="Using scenario outlines (outline example : | passing |)" time="0.005">
+        <system-out/>
+        <system-err/>
       </testcase>
-      <testcase classname="Scenario outlines.Using scenario outlines" name="Using scenario outlines (outline example : | failing |)" time="0.005">
+      <testcase classname="Scenario outlines" name="Using scenario outlines (outline example : | failing |)" time="0.005">
         <failure message="failed Using scenario outlines (outline example : | failing |)" type="failed">
           <![CDATA[Scenario Outline: Using scenario outlines
       
@@ -157,7 +199,15 @@ You \*must\* specify \-\-out DIR for the junit formatter
           <![CDATA[ (RuntimeError)
       features/scenario_outline.feature:4:in `Given a <type> scenario']]>
         </failure>
+        <system-out/>
+        <system-err/>
       </testcase>
+        <system-out>
+          <![CDATA[]]>
+        </system-out>
+        <system-err>
+          <![CDATA[]]>
+        </system-err>
       </testsuite>
 
       """

data/legacy_features/language_help.feature

@@ -7,21 +7,21 @@ Feature: Language help
     When I run cucumber --i18n pt help
     Then it should pass with
       """
-            | feature          | "Funcionalidade"                           |
-            | background       | "Contexto"                                 |
-            | scenario         | "Cenário", "Cenario"                       |
-            | scenario_outline | "Esquema do Cenário", "Esquema do Cenario" |
-            | examples         | "Exemplos"                                 |
-            | given            | "* ", "Dado "                              |
-            | when             | "* ", "Quando "                            |
-            | then             | "* ", "Então ", "Entao "                   |
-            | and              | "* ", "E "                                 |
-            | but              | "* ", "Mas "                               |
-            | given (code)     | "Dado"                                     |
-            | when (code)      | "Quando"                                   |
-            | then (code)      | "Então", "Entao"                           |
-            | and (code)       | "E"                                        |
-            | but (code)       | "Mas"                                      |
+            | feature          | "Funcionalidade", "Característica", "Caracteristica"                                         |
+            | background       | "Contexto", "Cenário de Fundo", "Cenario de Fundo", "Fundo"                                  |
+            | scenario         | "Cenário", "Cenario"                                                                         |
+            | scenario_outline | "Esquema do Cenário", "Esquema do Cenario", "Delineação do Cenário", "Delineacao do Cenario" |
+            | examples         | "Exemplos", "Cenários", "Cenarios"                                                           |
+            | given            | "* ", "Dado ", "Dada ", "Dados ", "Dadas "                                                   |
+            | when             | "* ", "Quando "                                                                              |
+            | then             | "* ", "Então ", "Entao "                                                                     |
+            | and              | "* ", "E "                                                                                   |
+            | but              | "* ", "Mas "                                                                                 |
+            | given (code)     | "Dado", "Dada", "Dados", "Dadas"                                                             |
+            | when (code)      | "Quando"                                                                                     |
+            | then (code)      | "Então", "Entao"                                                                             |
+            | and (code)       | "E"                                                                                          |
+            | but (code)       | "Mas"                                                                                        |
 
       """
   Scenario: List languages
@@ -31,6 +31,7 @@ Feature: Language help
       """
             | ar        | Arabic              | العربية           |
             | bg        | Bulgarian           | български         |
+            | bm        | Malay               | Bahasa Melayu     |
             | ca        | Catalan             | català            |
             | cs        | Czech               | Česky             |
             | cy-GB     | Welsh               | Cymraeg           |
@@ -51,6 +52,7 @@ Feature: Language help
             | hr        | Croatian            | hrvatski          |
             | hu        | Hungarian           | magyar            |
             | id        | Indonesian          | Bahasa Indonesia  |
+            | is        | Icelandic           | Íslenska          |
             | it        | Italian             | italiano          |
             | ja        | Japanese            | 日本語               |
             | ko        | Korean              | 한국어               |

data/legacy_features/snippets_when_using_star_keyword.feature

@@ -29,8 +29,9 @@ Feature: Use * keywords and still get snippets
         pending # express the regexp above with the code you wish you had
       end
       
-      If you want snippets in a different programming language, just make sure a file
-      with the appropriate file extension exists where cucumber looks for step definitions.
+      If you want snippets in a different programming language,
+      just make sure a file with the appropriate file extension
+      exists where cucumber looks for step definitions.
 
       
       """

data/legacy_features/step_definitions/cucumber_steps.rb

@@ -75,7 +75,7 @@ Then /^it should (fail|pass) with$/ do |success, output|
   unless combined_output.index(output)
     combined_output.should == output
   end
-  Then("it should #{success}")
+  step("it should #{success}")
 end
 
 Then /^the output should contain "([^"]*)"$/ do |text|

data/legacy_features/support/env.rb

@@ -126,7 +126,7 @@ class CucumberWorld
         exec cmd
       end
     end
-    sleep 1.0
+    sleep 2.0
   end
 
   def terminate_background_jobs

data/legacy_features/wire_protocol.feature

@@ -329,4 +329,4 @@ Feature: Wire Protocol
     Then STDERR should match
       """
       undefined method `handle_yikes'
-      """
+      """

data/lib/cucumber/ast/background.rb

@@ -96,6 +96,17 @@ module Cucumber
       end
 
 
+      # Override this method, as there are situations where the background
+      # wind up being the one called fore Before scenarios, and
+      # backgrounds don't have tags.
+      def source_tags
+        []
+      end
+
+      def source_tag_names
+        source_tags.map { |tag| tag.name }
+      end
+
     end
   end
 end

data/lib/cucumber/ast/doc_string.rb

@@ -16,59 +16,40 @@ module Cucumber
     #
     # Note how the indentation from the source is stripped away.
     #
-    class DocString #:nodoc:
-      class Builder
-        attr_reader :string
-
-        def initialize
-          @string = ''
-        end
-
-        def doc_string(string, line_number)
-          @string = string
-        end
-
-        def eof
-        end
-      end
-
+    class DocString < String #:nodoc:
       attr_accessor :file
 
       def self.default_arg_name
         "string"
       end
 
-      def self.parse(text)
-        builder = Builder.new
-        lexer = Gherkin::I18nLexer.new(builder)
-        lexer.scan(text)
-        new(builder.string)
-      end
+      attr_reader :content_type
 
-      def initialize(string)
-        @string = string
+      def initialize(string, content_type)
+        @content_type = content_type
+        super string
       end
 
       def to_step_definition_arg
-        @string
+        self
       end
 
       def accept(visitor)
         return if Cucumber.wants_to_quit
-        visitor.visit_doc_string(@string)
+        visitor.visit_doc_string(self)
       end
       
       def arguments_replaced(arguments) #:nodoc:
-        string = @string
+        string = self
         arguments.each do |name, value|
           value ||= ''
           string = string.gsub(name, value)
         end
-        DocString.new(string)
+        DocString.new(string, content_type)
       end
 
       def has_text?(text)
-        @string.index(text)
+        index(text)
       end
 
       # For testing only

data/lib/cucumber/ast/feature.rb

@@ -8,7 +8,7 @@ module Cucumber
       
       attr_accessor :language
       attr_writer :features, :background
-      attr_reader :file
+      attr_reader :file, :feature_elements
 
       def initialize(background, comment, tags, keyword, title, description, feature_elements)
         @background, @comment, @tags, @keyword, @title, @description, @feature_elements = background, comment, tags, keyword, title, description, feature_elements
@@ -53,8 +53,12 @@ module Cucumber
         end.join("\n")
       end
 
+      def source_tags
+        @tags.tags
+      end
+
       def source_tag_names
-        @tags.tag_names
+        source_tags.map { |tag| tag.name }
       end
 
       def accept_hook?(hook)

data/lib/cucumber/ast/feature_element.rb

@@ -63,11 +63,15 @@ module Cucumber
       end
 
       def accept_hook?(hook)
-        Gherkin::TagExpression.new(hook.tag_expressions).eval(source_tag_names)
+        Gherkin::TagExpression.new(hook.tag_expressions).eval(source_tags)
       end
-
+      
       def source_tag_names
-        (@tags.tag_names.to_a + (@feature ? @feature.source_tag_names.to_a : [])).uniq
+        source_tags.map { |tag| tag.name }
+      end
+
+      def source_tags
+        (@tags.tags.to_a + (@feature ? @feature.source_tags.to_a : [])).uniq
       end
 
       def language

data/lib/cucumber/ast/multiline_argument.rb

@@ -0,0 +1,30 @@
+require 'gherkin/rubify'
+
+module Cucumber
+  module Ast
+    module MultilineArgument
+
+      class << self
+        include Gherkin::Rubify
+
+        def from(argument)
+          return unless argument
+          return argument if argument.respond_to?(:to_step_definition_arg)
+          
+          case(rubify(argument))
+          when String
+            # TODO: this duplicates work that gherkin does. We should really pass the string to gherkin and let it parse it.
+            Ast::DocString.new(argument, '')
+          when Gherkin::Formatter::Model::DocString
+            Ast::DocString.new(argument.value, argument.content_type)
+          when Array
+            Ast::Table.new(argument.map{|row| row.cells})
+          else
+            raise ArgumentError, "Don't know how to convert #{argument} into a MultilineArgument"
+          end
+        end
+
+      end
+    end
+  end
+end