cucumber 0.3.104 → 0.4.0.rc1

data/lib/cucumber/formatter/junit.rb

@@ -28,9 +28,7 @@ module Cucumber
           @testsuite << @builder.target!
         end
 
-        basename = File.basename(feature.file)[0...-File.extname(feature.file).length]
-        feature_filename = File.join(@reportdir, "TEST-#{basename}.xml")
-        File.open(feature_filename, 'w') { |file| file.write(@testsuite.target!) }
+        write_file(feature_result_filename(feature.file), @testsuite.target!)
       end
 
       def before_background(*args)
@@ -59,69 +57,76 @@ module Cucumber
       end
       
       def after_steps(steps)
-        return if @in_background
+        return if @in_background || @outline
+        
         duration = Time.now - @steps_start
-        unless @outline
-          if steps.failed?
-            steps.each { |step| @output += "#{step.keyword} #{step.name}\n" }
-            @output += "\nMessage:\n"
-          end
-          build_testcase(duration, steps.status, steps.exception)
+        if steps.failed?
+          steps.each { |step| @output += "#{step.keyword} #{step.name}\n" }
+          @output += "\nMessage:\n"
         end
+        build_testcase(duration, steps.status, steps.exception)
       end
-
-      def before_outline_table(outline_table)
+      
+      def before_examples(*args)
         @header_row = true
       end
 
       def before_table_row(table_row)
-        if @outline
-          @table_start = Time.now
-        end
-        
-        @header_row = false
+        return unless @outline
+
+        @table_start = Time.now
       end
 
       def after_table_row(table_row)
-        if @outline
-          duration = Time.now - @table_start
-          unless @header_row
-            name_suffix = " (outline example : #{table_row.name})"
-            if table_row.failed?
-              @output += "Example row: #{table_row.name}\n"
-              @output += "\nMessage:\n"
-            end
-            build_testcase(duration, table_row.status, table_row.exception,  name_suffix)
+        return unless @outline
+        duration = Time.now - @table_start
+        unless @header_row
+          name_suffix = " (outline example : #{table_row.name})"
+          if table_row.failed?
+            @output += "Example row: #{table_row.name}\n"
+            @output += "\nMessage:\n"
           end
+          build_testcase(duration, table_row.status, table_row.exception, name_suffix)
         end
-        @header_row = false
+        
+        @header_row = false if @header_row
       end
 
       private
 
-        def build_testcase(duration, status, exception = nil, suffix = "")
-          @time += duration
-          classname = "#{@feature_name}.#{@scenario}"
-          name = "#{@scenario}#{suffix}"
-          failed = (status == :failed || (status == :pending && @options[:strict]))
-          #puts "FAILED:!!#{failed}"
-          if status == :passed || failed
-            @builder.testcase(:classname => classname, :name => name, :time => "%.6f" % duration) do
-              if failed
-                @builder.failure(:message => "#{status.to_s} #{name}", :type => status.to_s) do
-                  @builder.text! @output
-                  @builder.text!(format_exception(exception)) if exception
-                end
-                @failures += 1
+      def build_testcase(duration, status, exception = nil, suffix = "")
+        @time += duration
+        classname = "#{@feature_name}.#{@scenario}"
+        name = "#{@scenario}#{suffix}"
+        failed = (status == :failed || (status == :pending && @options[:strict]))
+        #puts "FAILED:!!#{failed}"
+        if status == :passed || failed
+          @builder.testcase(:classname => classname, :name => name, :time => "%.6f" % duration) do
+            if failed
+              @builder.failure(:message => "#{status.to_s} #{name}", :type => status.to_s) do
+                @builder.text! @output
+                @builder.text!(format_exception(exception)) if exception
               end
+              @failures += 1
             end
-            @tests += 1
           end
+          @tests += 1
         end
+      end
 
-        def format_exception(exception)
-          (["#{exception.message} (#{exception.class})"] + exception.backtrace).join("\n")
-        end
+      def format_exception(exception)
+        (["#{exception.message} (#{exception.class})"] + exception.backtrace).join("\n")
+      end
+      
+      def feature_result_filename(feature_file)
+        ext_length = File.extname(feature_file).length
+        basename = File.basename(feature_file)[0...-ext_length]
+        File.join(@reportdir, "TEST-#{basename}.xml")
+      end
+      
+      def write_file(feature_filename, data)
+        File.open(feature_filename, 'w') { |file| file.write(data) }
+      end
     end
   end
 end

data/lib/cucumber/formatter/pdf.rb

@@ -34,10 +34,7 @@ module Cucumber
         @indent = 0
         @buffer = []
         puts "writing to #{io.path}"
-        begin
-          @pdf.image open("features/support/logo.png"), :position => :center, :width => 500
-        rescue
-        end
+        load_cover_page_image
         @pdf.text "\n\n\nCucumber features", :align => :center, :size => 32
         @pdf.text "Generated: #{Time.now.strftime("%Y-%m-%d %H:%M")}", :size => 10, :at => [0, 24]
         @pdf.text "Command: <code>cucumber #{ARGV.join(" ")}</code>", :size => 10, :at => [0,10]
@@ -53,6 +50,21 @@ module Cucumber
         end
       end
 
+      def load_cover_page_image()
+        if (!load_image("features/support/logo.png"))
+          load_image("features/support/logo.jpg")
+        end
+      end
+
+      def load_image(image_path)
+        begin
+          @pdf.image open(image_path, "rb"), :position => :center, :width => 500
+          true
+        rescue Errno::ENOENT
+          false
+        end
+      end
+
       def after_features(features)
         @pdf.render_file(@io.path)
         puts "\ndone"

data/lib/cucumber/formatter/usage.rb

@@ -1,25 +1,13 @@
 require 'cucumber/formatter/progress'
+require 'cucumber/step_definition_light'
 
 module Cucumber
   module Formatter
     class Usage < Progress
       include Console
 
-      class StepDefKey
-        attr_reader :regexp_source, :file_colon_line
+      class StepDefKey < StepDefinitionLight
         attr_accessor :mean_duration, :status
-        
-        def initialize(regexp_source, file_colon_line)
-          @regexp_source, @file_colon_line = regexp_source, file_colon_line
-        end
-        
-        def eql?(o)
-          regexp_source == o.regexp_source && file_colon_line == o.file_colon_line
-        end
-        
-        def hash
-          regexp_source.hash + 17*file_colon_line.hash
-        end
       end
 
       def initialize(step_mother, io, options)

data/lib/cucumber/language_support/language_methods.rb

@@ -1,4 +1,5 @@
 require 'cucumber/step_match'
+require 'cucumber/step_definition_light'
 
 module Cucumber
   module LanguageSupport
@@ -30,10 +31,9 @@ module Cucumber
       end
 
       def execute_transforms(args)
-        transformed = nil
         args.map do |arg|
-          transforms.detect {|t| transformed = t.invoke arg }
-          transformed || arg
+          matching_transform = transforms.detect {|transform| transform.match(arg) }
+          matching_transform ? matching_transform.invoke(arg) : arg
         end
       end
 
@@ -51,8 +51,28 @@ module Cucumber
         hooks[phase.to_sym].select{|hook| scenario.accept_hook?(hook)}
       end
 
+      def unmatched_step_definitions
+        available_step_definition_hash.keys - invoked_step_definition_hash.keys
+      end
+
+      def available_step_definition(regexp_source, file_colon_line)
+        available_step_definition_hash[StepDefinitionLight.new(regexp_source, file_colon_line)] = nil
+      end
+
+      def invoked_step_definition(regexp_source, file_colon_line)
+        invoked_step_definition_hash[StepDefinitionLight.new(regexp_source, file_colon_line)] = nil
+      end
+
       private
 
+      def available_step_definition_hash
+        @available_step_definition_hash ||= {}
+      end
+
+      def invoked_step_definition_hash
+        @invoked_step_definition_hash ||= {}
+      end
+
       def hooks
         @hooks ||= Hash.new{|h,k| h[k] = []}
       end

data/lib/cucumber/languages.yml

@@ -500,6 +500,20 @@
   and: A
   but: Ale
   space_after_keyword: true
+"tr":
+  name: Turkish
+  native: Türkçe
+  encoding: UTF-8
+  feature: Özellik
+  background: Geçmiş
+  scenario: Senaryo
+  scenario_outline: Senaryo taslağı
+  examples: Örnekler
+  given: Diyelim ki
+  when: Eğer ki
+  then: O zaman
+  and: Ve
+  but: Fakat|Ama
 "uz":
   name: Uzbek
   native: Узбекча

data/lib/cucumber/parser/natural_language.rb

@@ -48,7 +48,7 @@ module Cucumber
       def keywords(key, raw=false)
         return @keywords[key] if raw
         return nil unless @keywords[key]
-        values = @keywords[key].split('|')
+        values = @keywords[key].to_s.split('|')
         values.map{|value| "'#{value}'"}.join(" / ")
       end
 

data/lib/cucumber/parser/table.rb

@@ -86,7 +86,7 @@ module Cucumber
         def build
           row = cells.elements.map do |elt| 
             value = elt.cell.text_value.strip
-            value.empty? ? nil : value
+            value
           end
 
           class << row
@@ -265,8 +265,9 @@ module Cucumber
           s1 << r2
           if r2
             if index < input_length
-              r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
-              @index += 1
+              next_character = index + input[index..-1].match(/\A(.)/um).end(1)
+              r6 = instantiate_node(SyntaxNode,input, index...next_character)
+              @index = next_character
             else
               terminal_parse_failure("any character")
               r6 = nil
@@ -302,8 +303,9 @@ module Cucumber
         end
 
         if has_terminal?('\G[ \\t]', true, index)
-          r0 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
+          next_character = index + input[index..-1].match(/\A(.)/um).end(1)
+          r0 = instantiate_node(SyntaxNode, input, index...next_character)
+          @index = next_character
         else
           r0 = nil
         end
@@ -389,8 +391,9 @@ module Cucumber
 
         i0 = index
         if index < input_length
-          r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
+          next_character = index + input[index..-1].match(/\A(.)/um).end(1)
+          r1 = instantiate_node(SyntaxNode,input, index...next_character)
+          @index = next_character
         else
           terminal_parse_failure("any character")
           r1 = nil

data/lib/cucumber/parser/table.tt

@@ -37,7 +37,7 @@ module Cucumber
           def build
             row = cells.elements.map do |elt| 
               value = elt.cell.text_value.strip
-              value.empty? ? nil : value
+              value
             end
 
             class << row

data/lib/cucumber/platform.rb

@@ -15,6 +15,7 @@ module Cucumber
   RAILS         = defined?(Rails)
   RUBY_BINARY   = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
   RUBY_1_9      = RUBY_VERSION =~ /^1\.9/
+  RUBY_1_8_7    = RUBY_VERSION =~ /^1\.8\.7/
 
   class << self
     attr_accessor :use_full_backtrace

data/lib/cucumber/py_support/py_dsl.py

@@ -1,8 +1,10 @@
-def Given(s):
-  register_rb_step_definition(s)
-  
-def register_rb_step_definition(s):
-  print "REGGED"
-  
-def set_py_language(py_language):
-  print "YAY"
+import py_language
+
+class Given(object):
+  def __init__(self, regexp):
+    self.regexp = regexp
+    
+  def __call__(self, f):
+    py_language.register_step_def(self.regexp, f)
+    return f
+  

data/lib/cucumber/py_support/py_language.py

@@ -1,2 +1,10 @@
 import py_dsl
 
+step_defs = {}
+
+def register_step_def(regexp, f):
+  print "Got a step def: ", regexp
+  step_defs[regexp] = f
+  
+def step_matches(step_name, formatted_step_name):
+  print "WTF: " + step_name

data/lib/cucumber/py_support/py_language.rb

@@ -3,16 +3,22 @@ require 'rubypython'
 module Cucumber
   module PySupport
     class PyLanguage
-#      include LanguageSupport::LanguageMethods
+      include LanguageSupport::LanguageMethods
 
       def initialize(step_mother)
-        @python_path = ENV['PYTHONPATH'] ? ENV['PYTHONPATH'].split(':') : []
-        add_to_python_path(File.dirname(__FILE__))
-
-        RubyPython.start
-        at_exit{RubyPython.stop}
+        @step_def_files = []
+        # 
+        # @python_path = ENV['PYTHONPATH'] ? ENV['PYTHONPATH'].split(':') : []
+        # add_to_python_path(File.dirname(__FILE__))
+        # 
+        # RubyPython.start
+        # at_exit{RubyPython.stop}
+        # 
+        # import(File.dirname(__FILE__) + '/py_language.py')
+      end
 
-        import(File.dirname(__FILE__) + '/py_language.py')
+      def load_code_file(py_file)
+        @step_def_files << py_file
       end
 
       def alias_adverbs(adverbs)
@@ -26,12 +32,19 @@ module Cucumber
         "python snippet: #{step_keyword}, #{step_name}"
       end
 
-      protected
-
       def begin_scenario
+        @python_path = []
+        add_to_python_path(File.dirname(__FILE__))
+        @step_def_files.each{|f| add_to_python_path(File.dirname(f))}
+        
+        RubyPython.start
+
+        @delegate = import(File.dirname(__FILE__) + '/py_language.py')
+        @step_def_files.each{|f| import(f)}
       end
 
-      def end_scenario
+      def step_matches(step_name, formatted_step_name)
+        @delegate.step_matches(step_name, formatted_step_name)
       end
 
       private
@@ -41,7 +54,7 @@ module Cucumber
         begin
           mod = RubyPython.import(modname)
         rescue PythonError => e
-          e.message << "Couldn't load #{path}\nConsider adding #{File.expand_path(File.dirname(path))} to your PYTHONPATH"
+#          e.message << "Couldn't load #{path}\nConsider adding #{File.expand_path(File.dirname(path))} to your PYTHONPATH"
           raise e
         end
       end

data/lib/cucumber/rails/action_controller.rb

@@ -29,5 +29,10 @@ rescue NameError # Failsafe was introduced in Rails 2.3.2
 end
 
 Before('@allow-rescue') do
+  @__orig_allow_rescue = ActionController::Base.allow_rescue
   ActionController::Base.allow_rescue = true
-end
+end
+
+After('@allow-rescue') do
+  ActionController::Base.allow_rescue = @__orig_allow_rescue
+end

data/lib/cucumber/rails/active_record.rb

@@ -1,11 +1,13 @@
 if defined?(ActiveRecord::Base)
+  Before do
+    $__cucumber_global_use_txn = !!Cucumber::Rails::World.use_transactional_fixtures if $__cucumber_global_use_txn.nil?
+  end
+
   Before('~@no-txn') do
-    @__cucumber_use_txn = Cucumber::Rails::World.use_transactional_fixtures
-    Cucumber::Rails::World.use_transactional_fixtures = true
+    Cucumber::Rails::World.use_transactional_fixtures = $__cucumber_global_use_txn
   end
 
   Before('@no-txn') do
-    @__cucumber_use_txn = Cucumber::Rails::World.use_transactional_fixtures
     Cucumber::Rails::World.use_transactional_fixtures = false
   end
 
@@ -31,7 +33,6 @@ if defined?(ActiveRecord::Base)
         ActiveRecord::Base.__send__(:decrement_open_transactions)
       end
     end
-    Cucumber::Rails::World.use_transactional_fixtures = @__cucumber_use_txn
   end
 else
   module Cucumber::Rails