aslakhellesoy-cucumber 0.3.95 → 0.3.96

data/History.txt

@@ -1,3 +1,22 @@
+== 0.3.96 2009-08-15
+
+This release doesn't have any directly visible new features or bug fixes. But there are big
+internal changes. This release has a new API for plugging in other programming languages.
+You can read more about that here: http://groups.google.com/group/cukes/browse_thread/thread/b9db8bf1f3ec9708
+
+This might break other tools that are using Cucumber's internal APIs. For example Spork broke and had to
+be patched. Please upgrade to Spork 0.5.9 if you are using Spork.
+
+=== New Features
+* Ability to preload natural language in Spork's prefork. Rerun script/generate cucumber --spork to see how. (Aslak Hellesøy)
+* Ability to control which DRb port is used via the --port flag or by setting CUCUMBER_DRB environment variable. (Chris Flipse)
+* Upgrade Rails generator to use webrat 0.5.0. (Aslak Hellesøy)
+* Upgrade Sinatra example to work with rack-test 0.4.1 and webrat 0.5.0. (Aslak Hellesøy)
+
+=== Changed Features
+* --strict will cause an exit code 1 for missing and pending (used to be for missing only). (Mads Buus)
+* junit formatter doesn't report pending steps unless --strict is used. (Mads Buus)
+
 == 0.3.95 2009-08-13
 
 This release improves Webrat support for table-like HTML markup. Now you can easily turn the HTML
@@ -15,6 +34,8 @@ This release also fixes several bugs related to --drb (Spork) and profiles (cucu
 * Resolved infinite loop problem when --drb was defined in a profile. (#408 Ben Mabey)
 
 === New Features
+* Cucumber::World#table has been overloaded to work with 2D Array in addition to a table String to be parsed. 
+* New When /^I fill in the following:$/ step definition for Webrat. Useful for filling out a form with a Table. (Aslak Hellesøy)
 * The object returned by element_at (Webrat::Element) has a #to_table that works for table, dl, ol and ul. (Aslak Hellesøy)
 * An explanation of why failures are ok is printed when --wip is used. (Aslak Hellesøy)
 * Added cucumber alias for cucumber:ok in Rails Rake tasks. (Aslak Hellesøy)

data/Manifest.txt

@@ -321,7 +321,7 @@ lib/cucumber/cli/language_help_formatter.rb
 lib/cucumber/cli/main.rb
 lib/cucumber/cli/options.rb
 lib/cucumber/cli/profile_loader.rb
-lib/cucumber/cli/rb_step_def_loader.rb
+lib/cucumber/constantize.rb
 lib/cucumber/core_ext/exception.rb
 lib/cucumber/core_ext/instance_exec.rb
 lib/cucumber/core_ext/proc.rb
@@ -346,12 +346,15 @@ lib/cucumber/formatter/tag_cloud.rb
 lib/cucumber/formatter/unicode.rb
 lib/cucumber/formatter/usage.rb
 lib/cucumber/formatters/unicode.rb
+lib/cucumber/language_support/hook_methods.rb
+lib/cucumber/language_support/language_methods.rb
+lib/cucumber/language_support/step_definition_methods.rb
 lib/cucumber/languages.yml
 lib/cucumber/parser.rb
 lib/cucumber/parser/feature.rb
 lib/cucumber/parser/feature.tt
 lib/cucumber/parser/i18n.tt
-lib/cucumber/parser/i18n/language.rb
+lib/cucumber/parser/natural_language.rb
 lib/cucumber/parser/table.rb
 lib/cucumber/parser/table.tt
 lib/cucumber/parser/treetop_ext.rb
@@ -359,8 +362,11 @@ lib/cucumber/platform.rb
 lib/cucumber/rails/rspec.rb
 lib/cucumber/rails/world.rb
 lib/cucumber/rake/task.rb
+lib/cucumber/rb_support/rb_dsl.rb
+lib/cucumber/rb_support/rb_hook.rb
+lib/cucumber/rb_support/rb_language.rb
+lib/cucumber/rb_support/rb_step_definition.rb
 lib/cucumber/rspec_neuter.rb
-lib/cucumber/step_definition.rb
 lib/cucumber/step_match.rb
 lib/cucumber/step_mother.rb
 lib/cucumber/version.rb

data/examples/sinatra/features/support/env.rb

@@ -1,11 +1,9 @@
 # See http://wiki.github.com/aslakhellesoy/cucumber/sinatra
 # for more details about Sinatra with Cucumber
 
-gem 'rack-test', '=0.3.0'
-gem 'aslakhellesoy-webrat', '=0.4.4.1'
+gem 'rack-test', '=0.4.1'
 gem 'sinatra', '=0.9.4'
 
-# Sinatra
 app_file = File.join(File.dirname(__FILE__), *%w[.. .. app.rb])
 require app_file
 # Force the application name because polyglot breaks the auto-detection logic.

data/features/cucumber_cli.feature

@@ -152,6 +152,7 @@ Feature: Cucumber command line
   Scenario: Run Norwegian
     Given I am in i18n/no
     When I run cucumber -q --language no features
+    Then STDERR should be empty
     Then it should pass with
       """
       # language: no

data/features/drb_server_integration.feature

@@ -23,21 +23,33 @@ Feature: DRb Server Integration
       """
     And a file named "features/sample.feature" with:
       """
+      # language: en
       Feature: Sample
         Scenario: this is a test
           Given I am just testing stuff
       """
+    And a file named "features/essai.feature" with:
+      """
+      # language: fr
+      Fonction: Essai
+        Scenario: ceci est un test
+          Soit je teste
+      """
     And a file named "features/step_definitions/all_your_steps_are_belong_to_us.rb" with:
     """
     Given /^I am just testing stuff$/ do
       # no-op
     end
+
+    Soit /^je teste$/ do
+      # no-op
+    end
     """
 
   Scenario: Feature Passing with --drb flag
     Given I am running spork in the background
 
-    When I run cucumber features/sample.feature --drb
+    When I run cucumber features --drb
     Then it should pass
     And STDERR should be empty
     And the output should contain
@@ -62,7 +74,7 @@ Feature: DRb Server Integration
     """
     And I am running spork in the background
 
-    When I run cucumber features/sample.feature --drb
+    When I run cucumber features --drb
     Then it should fail
     And the output should contain
       """
@@ -82,7 +94,7 @@ Feature: DRb Server Integration
 
     Given I am not running a DRb server in the background
 
-    When I run cucumber features/sample.feature --drb
+    When I run cucumber features --drb
     Then it should pass
     And STDERR should match
       """
@@ -118,3 +130,44 @@ Feature: DRb Server Integration
       I'm loading all the heavy stuff...
       I'm loading the stuff just for this run...
       """
+
+  Scenario: Feature Run with --drb specifying a non-standard port
+
+    Given I am running spork in the background on port 9000
+
+    When I run cucumber features --drb --port 9000
+    Then it should pass
+    And STDERR should be empty
+    And the output should contain
+      """
+      1 step (1 passed)
+      """
+    And the output should contain
+      """
+      I'm loading the stuff just for this run...
+      """
+    And the output should not contain
+      """
+      I'm loading all the heavy stuff...
+      """
+
+  Scenario: Feature Run with $CUCUMBER_DRB environment variable
+
+    Given I have environment variable CUCUMBER_DRB set to "9000"
+    And I am running spork in the background on port 9000
+
+    When I run cucumber features/ --drb
+    Then it should pass
+    And STDERR should be empty
+    And the output should contain
+      """
+      1 step (1 passed)
+      """
+    And the output should contain
+      """
+      I'm loading the stuff just for this run...
+      """
+    And the output should not contain
+      """
+      I'm loading all the heavy stuff...
+      """

data/features/junit_formatter.feature

@@ -27,15 +27,13 @@ Feature: JUnit output formatter
 
       Message:
        (RuntimeError)
-      ./features/step_definitions/steps.rb:6:in `/a failing scenario/'
       features/one_passing_one_failing.feature:7:in `Given a failing scenario'  </failure>
       </testcase>
       </testsuite>
 
       """
   
-  @mri186
-  Scenario: pending step
+  Scenario: pending steps are simply skipped
     When I run cucumber --format junit --out tmp/ features/pending.feature
     Then it should pass with
       """
@@ -44,17 +42,30 @@ Feature: JUnit output formatter
     And "examples/junit/tmp/TEST-pending.xml" with junit duration "0.009" should contain
       """
       <?xml version="1.0" encoding="UTF-8"?>
-      <testsuite errors="0" failures="1" name="Pending step" tests="1" time="0.009">
-      <testcase classname="Pending step.Pending" name="Pending" time="0.009">
+      <testsuite errors="0" failures="0" name="Pending step" tests="0" time="0.009">
+      </testsuite>
+      
+      """
+
+  Scenario: pending step with strict option should fail
+    When I run cucumber --format junit --out tmp/ features/pending.feature --strict
+    Then it should fail with
+      """
+
+      """
+    And "examples/junit/tmp/TEST-pending.xml" with junit duration "0.000160" should contain
+      """
+      <?xml version="1.0" encoding="UTF-8"?>
+      <testsuite errors="0" failures="1" name="Pending step" tests="1" time="0.000160">
+      <testcase classname="Pending step.Pending" name="Pending" time="0.000160">
         <failure message="pending Pending" type="pending">
       Scenario: Pending
 
       TODO (Cucumber::Pending)
-      ./features/step_definitions/steps.rb:10:in `/a pending step/'
       features/pending.feature:4:in `Given a pending step'  </failure>
       </testcase>
       </testsuite>
-      
+
       """
     
   Scenario: run all features
@@ -68,11 +79,11 @@ Feature: JUnit output formatter
   
   Scenario: show correct error message if no --out is passed
     When I run cucumber --format junit features
-	  Then STDERR should not match 
-		  """
+    Then STDERR should not match 
+      """
 can't convert .* into String \(TypeError\)
-		  """
+      """
     And STDERR should match
-		  """
+      """
 You \*must\* specify \-\-out DIR for the junit formatter
-	    """
+      """

data/features/step_definitions/cucumber_steps.rb

@@ -35,12 +35,20 @@ Given /^I am running spork in the background$/ do
   run_spork_in_background
 end
 
+Given /^I am running spork in the background on port (\d+)$/ do |port|
+  run_spork_in_background(port.to_i)
+end
+
 Given /^I am not running (?:.*) in the background$/ do
   # no-op
 end
 
+Given /^I have environment variable (\w+) set to "([^\"]*)"$/ do |variable, value|
+  set_env_var(variable, value)
+end
+
 When /^I run cucumber (.*)$/ do |cucumber_opts|
-  run "#{Cucumber::RUBY_BINARY} #{Cucumber::BINARY} --no-color #{cucumber_opts}"
+  run "#{Cucumber::RUBY_BINARY} -I #{Spork::LIBDIR} #{Cucumber::BINARY} --no-color #{cucumber_opts}"
 end
 
 When /^I run rake (.*)$/ do |rake_opts|
@@ -74,13 +82,15 @@ Then /^the output should be$/ do |text|
   last_stdout.should == text
 end
 
+
 Then /^"([^\"]*)" should contain$/ do |file, text|
   strip_duration(IO.read(file)).should == text
 end
 
 Then /^"([^\"]*)" with junit duration "([^\"]*)" should contain$/ do |actual_file, duration_replacement, text|
   actual = IO.read(actual_file)
-  actual = replace_junit_duration(actual, duration_replacement)
+  actual = replace_junit_duration(actual, duration_replacement) 
+  actual = strip_ruby186_extra_trace(actual)
   actual.should == text
 end
 
@@ -141,3 +151,4 @@ Then /^print output$/ do
   puts last_stdout
 end
 
+

data/features/support/env.rb

@@ -6,7 +6,7 @@ require 'forwardable'
 begin
   require 'spork'
 rescue Gem::LoadError => ex
-  gem 'spork', '>= 0.5.7' # Ensure correct spork version number to avoid false-negatives.
+  gem 'spork', '>= 0.5.9' # Ensure correct spork version number to avoid false-negatives.
 end
 
 class CucumberWorld
@@ -54,6 +54,10 @@ class CucumberWorld
     s.gsub(/\d+\.\d\d+/m, replacement)
   end
 
+  def strip_ruby186_extra_trace(s)  
+    s.gsub(/^.*\.\/features\/step_definitions(.*)\n/, "")
+  end
+
   def create_file(file_name, file_content)
     file_content.gsub!("CUCUMBER_LIB", "'#{cucumber_lib_dir}'") # Some files, such as Rakefiles need to use the lib dir
     in_current_dir do
@@ -61,6 +65,12 @@ class CucumberWorld
     end
   end
 
+  def set_env_var(variable, value)
+    @original_env_vars ||= {}
+    @original_env_vars[variable] = ENV[variable] 
+    ENV[variable]  = value
+  end
+
   def background_jobs
     @background_jobs ||= []
   end
@@ -84,7 +94,7 @@ class CucumberWorld
     @last_stderr = IO.read(stderr_file.path)
   end
 
-  def run_spork_in_background
+  def run_spork_in_background(port = nil)
     pid = fork
     in_current_dir do
       if pid
@@ -92,7 +102,8 @@ class CucumberWorld
       else
         # STDOUT.close
         # STDERR.close
-        cmd = "#{Cucumber::RUBY_BINARY} -I #{Cucumber::LIBDIR} #{Spork::BINARY} cuc"
+        port_arg = port ? "-p #{port}" : ''
+        cmd = "#{Cucumber::RUBY_BINARY} -I #{Cucumber::LIBDIR} #{Spork::BINARY} cuc #{port_arg}"
         exec cmd
       end
     end
@@ -107,6 +118,10 @@ class CucumberWorld
     end
   end
 
+  def restore_original_env_vars
+    @original_env_vars.each { |variable, value| ENV[variable] = value } if @original_env_vars
+  end
+
 end
 
 World do
@@ -120,4 +135,5 @@ end
 
 After do
   terminate_background_jobs
+  restore_original_env_vars
 end

data/lib/cucumber/ast/feature_element.rb

@@ -21,7 +21,7 @@ module Cucumber
     end
 
     def name_line_lengths
-      if @name.empty?
+      if @name.strip.empty?
         [@keyword.jlength]
       else
         @name.split("\n").enum_for(:each_with_index).map do |line, line_number|

data/lib/cucumber/ast/step.rb

@@ -1,5 +1,5 @@
-require 'cucumber/step_definition'
 require 'cucumber/core_ext/string'
+require 'cucumber/step_match'
 
 module Cucumber
   module Ast

data/lib/cucumber/ast/step_invocation.rb

@@ -1,3 +1,5 @@
+require 'cucumber/step_match'
+
 module Cucumber
   module Ast
     class StepInvocation
@@ -33,8 +35,7 @@ module Cucumber
         unless @skip_invoke || options[:dry_run] || @exception || @step_collection.exception
           @skip_invoke = true
           begin
-            step_mother.current_world.__cucumber_current_step = self if step_mother.current_world # Nil in Pure Java
-            @step_match.invoke(step_mother.current_world, @multiline_arg)
+            @step_match.invoke(@multiline_arg)
             step_mother.after_step
             status!(:passed)
           rescue Pending => e

data/lib/cucumber/cli/configuration.rb

@@ -1,4 +1,5 @@
 require 'cucumber/cli/options'
+require 'cucumber/constantize'
 
 module Cucumber
   module Cli
@@ -7,6 +8,8 @@ module Cucumber
     class ProfileNotFound < StandardError; end
 
     class Configuration
+      include Constantize
+      
       attr_reader :options
 
       def initialize(out_stream = STDOUT, error_stream = STDERR)
@@ -50,6 +53,10 @@ module Cucumber
         @options[:drb]
       end
 
+      def drb_port
+        @options[:drb_port].to_i if @options[:drb_port]
+      end
+
       def build_formatter_broadcaster(step_mother)
         return Formatter::Pretty.new(step_mother, nil, @options) if @options[:autoformat]
         formatters = @options[:formats].map do |format_and_out|
@@ -98,6 +105,8 @@ module Cucumber
         env_files = sorted_files.select {|f| f =~ %r{/support/env\..*} }
         files = env_files + sorted_files.reject {|f| f =~ %r{/support/env\..*} }
         remove_excluded_files_from(files)
+        files.reject! {|f| !File.file?(f)}
+        files.reject! {|f| File.extname(f) == '.feature' }
         files.reject! {|f| f =~ %r{/support/env\..*} } if @options[:dry_run]
         files
       end
@@ -112,22 +121,6 @@ module Cucumber
         potential_feature_files
       end
 
-      def constantize(camel_cased_word)
-        begin
-          names = camel_cased_word.split('::')
-          names.shift if names.empty? || names.first.empty?
-
-          constant = Object
-          names.each do |name|
-            constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
-          end
-          constant
-        rescue NameError
-          require underscore(camel_cased_word)
-          retry
-        end
-      end
-
     private
 
       def paths
@@ -159,15 +152,6 @@ module Cucumber
       def require_dirs
         feature_dirs + Dir['vendor/{gems,plugins}/*/cucumber']
       end
-
-      # Snagged from active_support
-      def underscore(camel_cased_word)
-        camel_cased_word.to_s.gsub(/::/, '/').
-          gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-          gsub(/([a-z\d])([A-Z])/,'\1_\2').
-          tr("-", "_").
-          downcase
-      end
       
     end
 

data/lib/cucumber/cli/drb_client.rb

@@ -7,14 +7,18 @@ module Cucumber
     end
     # Runs features on a DRB server, originally created with Spork compatibility in mind.
     class DRbClient
-      def self.run(args, error_stream, out_stream)
+      DEFAULT_PORT = 8990
+
+      def self.run(args, error_stream, out_stream, port = nil)
+        port ||= ENV["CUCUMBER_DRB"] || DEFAULT_PORT
+
         # See http://redmine.ruby-lang.org/issues/show/496 as to why we specify localhost:0
         DRb.start_service("druby://localhost:0")
-        feature_server = DRbObject.new_with_uri("druby://127.0.0.1:8990")
+        feature_server = DRbObject.new_with_uri("druby://127.0.0.1:#{port}")
         cloned_args = [] # I have no idea why this is needed, but if the regular args are sent then DRb magically transforms it into a DRb object - not an array
         args.each { |arg| cloned_args << arg }
         feature_server.run(cloned_args, error_stream, out_stream)
-      rescue DRb::DRbConnError
+      rescue DRb::DRbConnError => e
         raise DRbClientError, "No DRb server is running."
       end
     end

data/lib/cucumber/cli/language_help_formatter.rb

@@ -1,5 +1,5 @@
 require 'cucumber/formatter/pretty'
-require 'cucumber/parser/i18n/language'
+require 'cucumber/parser/natural_language'
 
 module Cucumber
   module Cli
@@ -23,8 +23,8 @@ http://wiki.github.com/aslakhellesoy/cucumber/spoken-languages
       end
 
       def self.list_keywords(io, lang)
-        language = Parser::I18n::Language[lang]
-        raw = Parser::I18n::Language::KEYWORD_KEYS.map do |key|
+        language = Parser::NaturalLanguage[lang]
+        raw = Parser::NaturalLanguage::KEYWORD_KEYS.map do |key|
           [key, language.keywords(key)]
         end
         table = Ast::Table.new(raw)
@@ -46,7 +46,7 @@ http://wiki.github.com/aslakhellesoy/cucumber/spoken-languages
       def visit_table_cell_value(value, status)
         if @col == 1
           if(@options[:check_lang])
-            @incomplete = Parser::I18n::Language[value].incomplete?
+            @incomplete = Parser::NaturalLanguage.get(nil, value).incomplete?
           end
           status = :comment 
         elsif @incomplete

data/lib/cucumber/cli/main.rb

@@ -15,17 +15,11 @@ module Cucumber
 
       class << self
         def step_mother
-          @step_mother
-        end
-
-        def step_mother=(step_mother)
-          @step_mother = step_mother
-          @step_mother.extend(StepMother)
-          @step_mother.snippet_generator = StepDefinition
+          @step_mother ||= StepMother.new
         end
 
         def execute(args)
-          new(args).execute!(@step_mother)
+          new(args).execute!(step_mother)
         end
       end
 
@@ -33,13 +27,15 @@ module Cucumber
         @args         = args
         @out_stream   = out_stream == STDOUT ? Formatter::ColorIO.new : out_stream
         @error_stream = error_stream
+        $err = error_stream
+        @unsupported_programming_languages = []
       end
 
       def execute!(step_mother)
         trap_interrupt
         if configuration.drb?
           begin
-            return DRbClient.run(@args, @error_stream, @out_stream)
+            return DRbClient.run(@args, @error_stream, @out_stream, configuration.drb_port)
           rescue DRbClientError => e
             @error_stream.puts "WARNING: #{e.message} Running features locally:"
           end
@@ -50,8 +46,8 @@ module Cucumber
         # This is because i18n step methods are only aliased when
         # features are loaded. If we swap the order, the requires
         # will fail.
-        features = load_plain_text_features
-        load_step_defs
+        features = load_plain_text_features(step_mother)
+        load_step_defs(step_mother)
         enable_diffing
 
         visitor = configuration.build_formatter_broadcaster(step_mother)
@@ -64,7 +60,7 @@ module Cucumber
             step_mother.scenarios(:passed).any?
           else
             step_mother.scenarios(:failed).any? ||
-            (configuration.strict? && step_mother.steps(:undefined).any?)
+            (configuration.strict? && (step_mother.steps(:undefined).any? || step_mother.steps(:pending).any?))
           end
       rescue ProfilesNotDefinedError, YmlLoadError, ProfileNotFound => e
         @error_stream.puts e.message
@@ -84,19 +80,19 @@ module Cucumber
         exceeded
       end
 
-      def load_plain_text_features
+      def load_plain_text_features(step_mother)
         features = Ast::Features.new
 
         verbose_log("Features:")
         configuration.feature_files.each do |f|
           feature_file = FeatureFile.new(f)
-          feature = feature_file.parse(configuration.options)
+          feature = feature_file.parse(step_mother, configuration.options)
           if feature
             features.add_feature(feature)
             verbose_log("  * #{f}")
           end
         end
-        verbose_log("\n"*2)
+        verbose_log("\n")
         features
       end
 
@@ -114,50 +110,36 @@ module Cucumber
 
       private
 
-      def load_step_defs
+      def load_step_defs(step_mother)
         step_def_files = configuration.step_defs_to_load
-        verbose_log("Step Definitions Files:")
+        verbose_log("Step Definitions:")
         step_def_files.each do |step_def_file|
-          load_step_def(step_def_file)
+          load_step_def(step_mother, step_def_file)
         end
+        verbose_log("\n")
       end
 
-      def load_step_def(step_def_file)
-        if loader = step_def_loader_for(step_def_file)
+      def load_step_def(step_mother, step_def_file)
+        if programming_language = programming_language_for(step_mother, step_def_file)
           verbose_log("  * #{step_def_file}")
-          loader.load_step_def_file(self, step_def_file)
+          programming_language.load_step_def_file(step_def_file)
+        else
+          verbose_log("  * #{step_def_file} [NOT SUPPORTED]")
         end
       end
 
-      def step_def_loader_for(step_def_file)
-        @sted_def_loaders ||= {}
+      def programming_language_for(step_mother, step_def_file) # :nodoc:
         if ext = File.extname(step_def_file)[1..-1]
-          loader = @sted_def_loaders[ext]
-          return nil if loader == :missing
-          return loader if loader
+          return nil if @unsupported_programming_languages.index(ext)
           begin
-            loader_class = configuration.constantize("Cucumber::Cli::#{ext.capitalize}StepDefLoader")
-            return @sted_def_loaders[ext] = loader_class.new
+            step_mother.load_programming_language(ext)
           rescue LoadError
-            @sted_def_loaders[ext] = :missing
+            @unsupported_programming_languages << ext
             nil
           end
+        else
+          nil
         end
-        nil
-      end
-
-      def step_def_files
-        main.verbose_log("Ruby files required:")
-        main.verbose_log(requires.map{|lib| "  * #{lib}"}.join("\n"))
-        requires.each do |lib|
-          begin
-            require lib
-          rescue LoadError => e
-            e.message << "\nFailed to load #{lib}"
-            raise e
-          end
-        end
-        main.verbose_log("\n")
       end
 
       def enable_diffing
@@ -186,5 +168,3 @@ module Cucumber
     end
   end
 end
-
-Cucumber::Cli::Main.step_mother = self