cucumber 0.9.3 → 0.9.4

data/Gemfile

@@ -1,2 +1,7 @@
 source "http://rubygems.org"
+
+group :development do
+  gem 'bundler', '~> 1.0.3'
+end
+
 gemspec

data/History.txt

@@ -1,3 +1,12 @@
+== 0.9.4 (2010-11-07)
+
+=== Bugfixes
+* Superfluous space after step_keyword value in snippet_text message (#679 Aslak Hellesøy)
+* Better Handling for "announce" in HTML formatter (#676 Stephen Kennedy)
+* Too many open files - getcwd (#666 Aslak Hellesøy)
+* Cucumber 0.9.3 prevents Test::Unit from running (#677 Aslak Hellesøy)
+* Performance degradation when running feature files with over 1000 steps (#675 Dimitri Geshef)
+
 == 0.9.3 (2010-10-24)
 
 === Bugfixes

data/cucumber.gemspec

@@ -31,7 +31,7 @@ for important information about this release. Happy cuking!
   s.add_dependency 'json', '~> 1.4.6'
   
   s.add_development_dependency 'rake', '~> 0.8.7'
-  s.add_development_dependency 'rspec', '~> 2.0.0.beta.20'
+  s.add_development_dependency 'rspec', '~> 2.0.1'
   s.add_development_dependency 'nokogiri', '~> 1.4.3'
   s.add_development_dependency 'prawn', '= 0.8.4'
   s.add_development_dependency 'prawn-layout', '= 0.8.4'

data/features/support/env.rb

@@ -5,6 +5,11 @@ require 'rspec/expectations'
 require 'fileutils'
 require 'forwardable'
 require 'cucumber/formatter/unicode'
+# This is to force miniunit to be loaded on 1.9.2, and verify that we can still run with --profile. See:
+# * disable_mini_test_autorun.rb and 
+# * http://groups.google.com/group/cukes/browse_thread/thread/5682d41436e235d7
+# * https://rspec.lighthouseapp.com/projects/16211/tickets/677-cucumber-093-prevents-testunit-from-running
+require 'test/unit'
 
 class CucumberWorld
   extend Forwardable

data/features/wire_protocol.feature

@@ -294,9 +294,9 @@ Feature: Wire Protocol
     Given there is a wire server running on port 54321 which understands the following protocol:
       | request                                                                                          | response                         |
       | ["step_matches",{"name_to_match":"we're all wired"}]                                             | ["success",[]]                   |
-      | ["snippet_text",{"step_keyword":"Given ","multiline_arg_class":"","step_name":"we're all wired"}] | ["success","foo()\n  bar;\nbaz"] |
+      | ["snippet_text",{"step_keyword":"Given","multiline_arg_class":"","step_name":"we're all wired"}] | ["success","foo()\n  bar;\nbaz"] |
       | ["begin_scenario"]                                                                               | ["success"]                      |
-      | ["end_scenario"]                                                                                 | ["success"]                      |
+      | ["end_scenario"]                                                                                | ["success"]                      |
     When I run cucumber -f pretty
     Then STDERR should be empty
     And it should pass with

data/lib/cucumber.rb

@@ -8,7 +8,6 @@ require 'cucumber/step_mother'
 require 'cucumber/cli/main'
 require 'cucumber/broadcaster'
 require 'cucumber/step_definitions'
-require 'cucumber/core_ext/disable_mini_unit_autorun'
 
 module Cucumber
   class << self

data/lib/cucumber/ast/background.rb

@@ -4,7 +4,7 @@ module Cucumber
   module Ast
     class Background #:nodoc:
       include FeatureElement
-      attr_reader :feature_elements
+      attr_reader :feature_elements, :name
 
       def initialize(comment, line, keyword, name, raw_steps)
         @comment, @line, @keyword, @name, @raw_steps = comment, line, keyword, name, raw_steps
@@ -35,13 +35,15 @@ module Cucumber
         visitor.visit_background_name(@keyword, @name, file_colon_line(@line), source_indent(first_line_length))
         with_visitor(hook_context, visitor) do
           visitor.step_mother.before(hook_context)
+          skip_invoke! if failed?
           visitor.visit_steps(@step_invocations)
-          @failed = @step_invocations.detect{|step_invocation| step_invocation.exception}
+          @failed = @step_invocations.detect{|step_invocation| step_invocation.exception || step_invocation.status != :passed }
           visitor.step_mother.after(hook_context) if @failed || @feature_elements.empty?
         end
       end
       
       def with_visitor(scenario, visitor)
+        @current_visitor = visitor
         init
         if self != scenario && scenario.respond_to?(:with_visitor)
           scenario.with_visitor(visitor) do
@@ -62,6 +64,10 @@ module Cucumber
         end
       end
 
+      def skip_invoke!
+        @step_invocations.each{|step_invocation| step_invocation.skip_invoke!}
+      end
+
       def failed?
         @failed
       end
@@ -80,6 +86,14 @@ module Cucumber
         sexp += steps if steps.any?
         sexp
       end
+
+      def fail!(exception)
+        @failed = true
+        @exception = exception
+        @current_visitor.visit_exception(@exception, :failed)        
+      end
+
+
     end
   end
 end

data/lib/cucumber/ast/table.rb

@@ -154,7 +154,7 @@ module Cucumber
       #
       # gets converted into the following:
       #
-      #   [['a', 'b], ['c', 'd']]
+      #   [['a', 'b'], ['c', 'd']]
       #
       def raw
         cell_matrix.map do |row|
@@ -164,6 +164,10 @@ module Cucumber
         end
       end
 
+      def column_names	#:nodoc:
+        @col_names ||= cell_matrix[0].map { |cell| cell.value }
+      end
+
       # Same as #raw, but skips the first (header) row
       def rows
         raw[1..-1]
@@ -380,7 +384,7 @@ module Cucumber
         hash = Hash.new do |hash, key|
           hash[key.to_s] if key.is_a?(Symbol)
         end
-        raw[0].each_with_index do |column_name, column_index|
+        column_names.each_with_index do |column_name, column_index|
           value = @conversion_procs[column_name].call(cells.value(column_index))
           hash[column_name] = value
         end
@@ -681,4 +685,4 @@ module Cucumber
       end
     end
   end
-end
+end

data/lib/cucumber/cli/options.rb

@@ -165,7 +165,7 @@ module Cucumber
             "This represents the boolean expression (@foo || !@bar) && @zap.",
             "\n",
             "Beware that if you want to use several negative tags to exclude several tags",
-            "you have to use logical AND: --tags ~@fixme --tags @buggy.",
+            "you have to use logical AND: --tags ~@fixme --tags ~@buggy.",
             "\n",
             "Positive tags can be given a threshold to limit the number of occurrences.", 
             "Example: --tags @qa:3 will fail if there are more than 3 occurrences of the @qa tag.",

data/lib/cucumber/core_ext/disable_mini_unit_autorun.rb

@@ -5,6 +5,10 @@ begin
     class << self
       @@installed_at_exit = true
     end
+
+    def run(*)
+      0
+    end
   end
 rescue LoadError => ignore
 end

data/lib/cucumber/core_ext/proc.rb

@@ -1,6 +1,7 @@
 # Proc extension to get more location info out of a proc
 class Proc #:nodoc:
   PROC_PATTERN = /[\d\w]+@(.+):(\d+).*>/
+  PWD = Dir.pwd
   
   def to_comment_line
     "# #{file_colon_line}"
@@ -14,7 +15,7 @@ class Proc #:nodoc:
     def file_colon_line
       path, line = *to_s.match(PROC_PATTERN)[1..2]
       path = File.expand_path(path)
-      pwd = File.expand_path(Dir.pwd)
+      pwd = File.expand_path(PWD)
       if path.index(pwd)
         path = path[pwd.length+1..-1]
       elsif path =~ /.*\/gems\/(.*\.rb)$/

data/lib/cucumber/formatter/cucumber.css

@@ -129,6 +129,12 @@ body {
   background: #fcfb98;
   color: #131313;
 }
+.cucumber table td.announcement, td table td.announcement, th table td.announcement {
+  border-left: 5px solid aqua;
+  border-bottom: 1px solid aqua;
+  background: #e0ffff;
+  color: #001111;
+}
 .cucumber ol, td ol, th ol {
   list-style: none;
   margin: 0px;
@@ -175,6 +181,13 @@ body {
   background: #fcfb98;
   color: #131313;
 }
+.cucumber ol li.announcement, td ol li.announcement, th ol li.announcement {
+  border-left: 5px solid aqua;
+  border-bottom: 1px solid aqua;
+  background: #e0ffff;
+  color: #001111;
+  margin-left: 10px;
+}
 .cucumber #summary, td #summary, th #summary {
   margin: 0px;
   padding: 5px 10px;

data/lib/cucumber/formatter/cucumber.sass

@@ -1,28 +1,32 @@
 /* cucumber.css is generated from cucumber.sass */
 /* Regenerate with rake sass */
 
-!step_left        = 5px "solid"
-!step_bottom      = 1px "solid"
+!step_left           = 5px "solid"
+!step_bottom         = 1px "solid"
 
-!failed           = #FFFBD3
-!failed_border    = #C20000
-!failed_text      = #C20000
+!failed              = #FFFBD3
+!failed_border       = #C20000
+!failed_text         = #C20000
 
-!passed           = #DBFFB4
-!passed_border    = #65C400
-!passed_text      = #3D7700
+!passed              = #DBFFB4
+!passed_border       = #65C400
+!passed_text         = #3D7700
 
-!skipped          = #E0FFFF
-!skipped_border   = #00FFFF
-!skipped_text     = #001111
+!skipped             = #E0FFFF
+!skipped_border      = #00FFFF
+!skipped_text        = #001111
 
-!pending          = #FCFB98
-!pending_border   = #FAF834
-!pending_text     = #131313
+!pending             = #FCFB98
+!pending_border      = #FAF834
+!pending_text        = #131313
 
-!undefined        = #FCFB98
-!undefined_border = #FAF834
-!undefined_text   = #131313
+!undefined           = #FCFB98
+!undefined_border    = #FAF834
+!undefined_text      = #131313
+
+!announcement        = #E0FFFF
+!announcement_border = #00FFFF
+!announcement_text   = #001111
 
 body
   :font-size 0px
@@ -148,6 +152,11 @@ body
       :border-bottom= !step_bottom !undefined_border
       :background= !undefined
       :color= !undefined_text
+    td.announcement
+      :border-left= !step_left !announcement_border
+      :border-bottom= !step_bottom !announcement_border
+      :background= !announcement
+      :color= !announcement_text
 
   ol
     :list-style none
@@ -187,6 +196,12 @@ body
       :border-bottom= !step_bottom !undefined_border
       :background= !undefined
       :color= !undefined_text
+    li.announcement
+      :border-left= !step_left !announcement_border
+      :border-bottom= !step_bottom !announcement_border
+      :background= !announcement
+      :color= !announcement_text
+      :margin-left= 10px
             
   #summary
     :margin 0px

data/lib/cucumber/formatter/html.rb

@@ -20,6 +20,7 @@ module Cucumber
         @scenario_number = 0
         @step_number = 0
         @header_red = nil
+        @delayed_announcements = []
       end
 
       def embed(file, mime_type)
@@ -245,6 +246,7 @@ module Cucumber
           end
         end
         @builder << '</li>'
+        print_announcements
       end
 
       def step_name(keyword, step_match, status, source_indent, background)
@@ -298,6 +300,7 @@ module Cucumber
   
       def after_table_row(table_row)
         return if @hide_this_step
+        print_table_row_announcements
         @builder << '</tr>'
         if table_row.exception
           @builder.tr do
@@ -328,7 +331,34 @@ module Cucumber
       end
 
       def announce(announcement)
-        @builder.pre(announcement, :class => 'announcement')
+        @delayed_announcements << announcement
+        #@builder.pre(announcement, :class => 'announcement')
+      end
+      
+      def print_announcements
+        return if @delayed_announcements.empty?
+        
+        #@builder.ol do
+          @delayed_announcements.each do |ann|
+            @builder.li(:class => 'step announcement') do
+              @builder << ann
+            end
+          end
+        #end
+        empty_announcements
+      end
+      
+      def print_table_row_announcements
+        return if @delayed_announcements.empty?
+        
+        @builder.td(:class => 'announcement') do
+          @builder << @delayed_announcements.join(", ")
+        end
+        empty_announcements
+      end
+      
+      def empty_announcements
+        @delayed_announcements = []
       end
 
       protected

data/lib/cucumber/js_support/js_snippets.rb

@@ -4,7 +4,7 @@ module Cucumber
       PARAM_PATTERN = /"([^"]*)"/
       ESCAPED_PARAM_PATTERN = '"([^\\"]*)"'
 
-      def snippet_text(step_keyword, step_name, multiline_arg_class)
+      def snippet_text(code_keyword, step_name, multiline_arg_class)
         escaped = Regexp.escape(step_name).gsub('\ ', ' ').gsub('/', '\/')
         escaped = escaped.gsub(PARAM_PATTERN, ESCAPED_PARAM_PATTERN)
 
@@ -20,7 +20,7 @@ module Cucumber
           multiline_class_comment = "//#{multiline_arg_class.default_arg_name} is a #{multiline_arg_class.to_s}\n"
         end
 
-        "#{step_keyword}(/^#{escaped}$/, function(#{block_arg_string}){\n  #{multiline_class_comment}  //express the regexp above with the code you wish you had\n});"
+        "#{code_keyword}(/^#{escaped}$/, function(#{block_arg_string}){\n  #{multiline_class_comment}  //express the regexp above with the code you wish you had\n});"
       end
     end
   end

data/lib/cucumber/platform.rb

@@ -4,7 +4,7 @@ require 'rbconfig'
 
 module Cucumber
 unless defined?(Cucumber::VERSION)
-  VERSION       = '0.9.3'
+  VERSION       = '0.9.4'
   BINARY        = File.expand_path(File.dirname(__FILE__) + '/../../bin/cucumber')
   LIBDIR        = File.expand_path(File.dirname(__FILE__) + '/../../lib')
   JRUBY         = defined?(JRUBY_VERSION)

data/lib/cucumber/py_support/py_language.rb

@@ -28,8 +28,8 @@ module Cucumber
         mod = import(py_file)
       end
 
-      def snippet_text(step_keyword, step_name, multiline_arg_class)
-        "python snippet: #{step_keyword}, #{step_name}"
+      def snippet_text(code_keyword, step_name, multiline_arg_class)
+        "python snippet: #{code_keyword}, #{step_name}"
       end
 
       def begin_scenario(scenario)

data/lib/cucumber/rb_support/rb_language.rb

@@ -91,7 +91,7 @@ module Cucumber
 
       ARGUMENT_PATTERNS = ['"([^"]*)"', '(\d+)']
 
-      def snippet_text(step_keyword, step_name, multiline_arg_class)
+      def snippet_text(code_keyword, step_name, multiline_arg_class)
         snippet_pattern = Regexp.escape(step_name).gsub('\ ', ' ').gsub('/', '\/')
         arg_count = 0
         ARGUMENT_PATTERNS.each do |pattern|
@@ -107,7 +107,7 @@ module Cucumber
           multiline_class_comment = "# #{multiline_arg_class.default_arg_name} is a #{multiline_arg_class.to_s}\n  "
         end
 
-        "#{Gherkin::I18n.code_keyword_for(step_keyword)} /^#{snippet_pattern}$/ do#{block_arg_string}\n  #{multiline_class_comment}pending # express the regexp above with the code you wish you had\nend"
+        "#{code_keyword} /^#{snippet_pattern}$/ do#{block_arg_string}\n  #{multiline_class_comment}pending # express the regexp above with the code you wish you had\nend"
       end
 
       def begin_rb_scenario(scenario)

data/lib/cucumber/runtime.rb

@@ -1,7 +1,8 @@
+require 'gherkin/rubify'
+require 'gherkin/i18n'
 require 'cucumber/configuration'
 require 'cucumber/language_support/language_methods'
 require 'cucumber/formatter/duration'
-require 'gherkin/rubify'
 require 'cucumber/runtime/user_interface'
 require 'cucumber/runtime/features_loader'
 require 'cucumber/runtime/results'
@@ -16,6 +17,7 @@ module Cucumber
     include Runtime::UserInterface
 
     def initialize(configuration = Configuration.default)
+      require 'cucumber/core_ext/disable_mini_unit_autorun'
       @current_scenario = nil
       @configuration = Configuration.parse(configuration)
       @support_code = SupportCode.new(self, @configuration)
@@ -68,7 +70,7 @@ module Cucumber
     end
 
     def snippet_text(step_keyword, step_name, multiline_arg_class) #:nodoc:
-      @support_code.snippet_text(step_keyword, step_name, multiline_arg_class)
+      @support_code.snippet_text(Gherkin::I18n.code_keyword_for(step_keyword), step_name, multiline_arg_class)
     end
 
     def with_hooks(scenario, skip_hooks=false)

data/lib/cucumber/runtime/results.rb

@@ -4,18 +4,32 @@ module Cucumber
     class Results
       def initialize(configuration)
         @configuration = configuration
+
+        # Optimization - quicker lookup.
+        @inserted_steps = {}
+        @inserted_scenarios = {}
       end
-      
+
       def configure(new_configuration)
         @configuration = Configuration.parse(new_configuration)
       end
-      
+
       def step_visited(step) #:nodoc:
-        steps << step unless steps.index(step)
+        step_id = step.object_id
+
+        unless @inserted_steps.has_key?(step_id)
+          @inserted_steps[step_id] = step
+          steps.push(step)
+        end
       end
       
       def scenario_visited(scenario) #:nodoc:
-        scenarios << scenario unless scenarios.index(scenario)
+        scenario_id = scenario.object_id
+
+        unless @inserted_scenarios.has_key?(scenario_id)
+          @inserted_scenarios[scenario_id] = scenario
+          scenarios.push(scenario)
+        end
       end
       
       def steps(status = nil) #:nodoc:

data/lib/cucumber/step_mother.rb

@@ -3,7 +3,7 @@ require 'cucumber/runtime'
 module Cucumber
   class StepMother < Runtime
     def initialize(*args)
-      warn("StepMother has been deprecated and will be gently put to sleep at the next major next release. Please use Runtime instead. #{caller[0]}")
+      warn("StepMother has been deprecated and will be gently put to sleep at the next major release. Please use Runtime instead. #{caller[0]}")
       super
     end
   end

data/lib/cucumber/wire_support/wire_language.rb

@@ -26,9 +26,9 @@ module Cucumber
         @connections << Connection.new(config)
       end
       
-      def snippet_text(step_keyword, step_name, multiline_arg_class)
+      def snippet_text(code_keyword, step_name, multiline_arg_class)
         snippets = @connections.map do |remote| 
-          remote.snippet_text(step_keyword, step_name, multiline_arg_class.to_s)
+          remote.snippet_text(code_keyword, step_name, multiline_arg_class.to_s)
         end
         snippets.flatten.join("\n")
       end

data/spec/cucumber/ast/background_spec.rb

@@ -48,6 +48,63 @@ module Cucumber
         $x.should == 2
         $y.should == 10
       end
+
+      describe "should respond to #name" do
+        it "with a value" do
+          background = Background.new(
+            comment=Comment.new(''),
+            line=2,
+            keyword="",
+            name="background name",
+            steps=[])
+          lambda{ background.name }.should_not raise_error
+          background.name.should == 'background name'
+        end
+        it "without a value" do
+          background = Background.new(
+            comment=Comment.new(''),
+            line=2,
+            keyword="",
+            name=nil,
+            steps=[])
+        lambda{ background.name }.should_not raise_error
+        end
+      end
+
+      describe "failures in a Before hook" do
+
+        before do
+          Before do
+            raise Exception, "Exception from Before hook"
+          end
+        end
+
+        it "should state that the background has failed" do
+          # Assign
+          background = Background.new(
+            comment=Comment.new(''),
+            line=2,
+            keyword="",
+            name="",
+            steps=[
+              Step.new(7, "Given", "y is 5")
+            ])
+          background.feature = @feature
+
+          # Expect
+          @visitor.should_receive( :visit_exception ) do |exception, status|
+            exception.should be_instance_of( Exception )
+            exception.message.should == "Exception from Before hook"
+            status.should == :failed
+           end
+
+          # Assert
+          lambda{ @visitor.visit_background(background) }.should_not raise_error
+          background.should be_failed
+        end
+
+      end
     end
+    
   end
 end

data/spec/cucumber/ast/table_spec.rb

@@ -335,6 +335,23 @@ module Cucumber
           }
         end
 
+        it "should detect seemingly identical tables as different" do
+          t1 = Table.new([
+            ['X',  'Y'],
+            ['2', '1']
+          ])
+          t2 = Table.new([
+            ['X',  'Y'],
+            [2, 1]
+          ])
+          lambda{t1.diff!(t2)}.should raise_error
+          t1.to_s(:indent => 12, :color => false).should == %{
+            |     X       |     Y       |
+            | (-) (i) "2" | (-) (i) "1" |
+            | (+) (i) 2   | (+) (i) 1   |
+          }
+        end
+
         it "should not allow mappings that match more than 1 column" do
           t1 = Table.new([
             ['Cuke',  'Duke'],

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 3
-  version: 0.9.3
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-24 00:00:00 +01:00
+date: 2010-11-07 00:00:00 +00:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -117,10 +117,8 @@ dependencies:
         segments: 
         - 2
         - 0
-        - 0
-        - beta
-        - 20
-        version: 2.0.0.beta.20
+        - 1
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: *id007
@@ -762,7 +760,7 @@ licenses: []
 
 post_install_message: "\n\
   (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)\n\n\
-  Thank you for installing cucumber-0.9.3.\n\
+  Thank you for installing cucumber-0.9.4.\n\
   Please be sure to read http://wiki.github.com/aslakhellesoy/cucumber/upgrading\n\
   for important information about this release. Happy cuking!\n\n\
   (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)\n\n"
@@ -775,7 +773,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4045923160433736312
+      hash: 95980206032165697
       segments: 
       - 0
       version: "0"
@@ -784,7 +782,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4045923160433736312
+      hash: 95980206032165697
       segments: 
       - 0
       version: "0"
@@ -794,7 +792,7 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: cucumber-0.9.3
+summary: cucumber-0.9.4
 test_files: 
 - features/announce.feature
 - features/api/list_step_defs_as_json.feature