aslakhellesoy-cucumber 0.3.1.1 → 0.3.2

data/History.txt

@@ -1,11 +1,18 @@
-== 0.3.2 (In Git)
+== 0.3.2 2009-05-05
+
+This release has some minor bug fixes and new features.
+Nothing major, but we need a release for RailsConf'09 in Las Vegas!
 
 === Bugfixes
+* rake tasks with profiles not respecting --require flags (#311 Ben Mabey)
 * Step table with blank cell fails (#308 JohnnyT)
+* Fixed error where unused table cells in Examples where raising exceptions due to having no status (#302 Joseph Wilk)
 
 === New features
+* Support for Hebrew (Ido Kanner)
 * Summary should report scenarios (#32 Aslak Hellesøy)
 * Examples and the associated tables are indented one level deeper than Scenario Outline. (Aslak Hellesøy)
+* Added support for Examples selection when using --name. (#295 Joseph Wilk)
 
 == 0.3.1 2009-04-26
 

data/Manifest.txt

@@ -67,6 +67,11 @@ examples/i18n/fr/Rakefile
 examples/i18n/fr/features/addition.feature
 examples/i18n/fr/features/step_definitions/calculatrice_steps.rb
 examples/i18n/fr/lib/calculatrice.rb
+examples/i18n/he/Rakefile
+examples/i18n/he/features/addition.feature
+examples/i18n/he/features/division.feature
+examples/i18n/he/features/step_definitons/calculator_steps.rb
+examples/i18n/he/lib/calculator.rb
 examples/i18n/hu/Rakefile
 examples/i18n/hu/features/addition.feature
 examples/i18n/hu/features/division.feature
@@ -341,6 +346,7 @@ spec/cucumber/formatter/html/cucumber.js
 spec/cucumber/formatter/html/index.html
 spec/cucumber/formatter/html/jquery-1.3.min.js
 spec/cucumber/formatter/html/jquery.uitableedit.js
+spec/cucumber/formatter/progress_spec.rb
 spec/cucumber/parser/feature_parser_spec.rb
 spec/cucumber/parser/table_parser_spec.rb
 spec/cucumber/rails/stubs/mini_rails.rb

data/examples/i18n/he/Rakefile

@@ -0,0 +1,6 @@
+$:.unshift(File.dirname(__FILE__) + '/../../../lib')
+require 'cucumber/rake/task'
+
+Cucumber::Rake::Task.new do |t|
+  t.cucumber_opts = "--language he"
+end

data/examples/i18n/he/features/addition.feature

@@ -0,0 +1,16 @@
+תכונה: חיבור
+  כדי למנוע טעויות טפשיות
+  בתור בור מתמטי
+  אני רוצה שיגידו לי את הסכום של שני מספרים
+
+  תבנית תרחיש: חבר שני מספרים
+    בהינתן שהזנתי <קלט_1> למחשבון
+    וגם שהזנתי <קלט_2> למחשבון
+    כאשר אני לוחץ על <כפתור>
+    אז התוצאה על המסך צריכה להיות <פלט>
+
+  דוגמאות:
+    | קלט_1 | קלט_2 | כפתור | פלט |
+    | 20    | 30    | חבר   | 50  |
+    | 2     | 5     | חבר   | 7   |
+    | 0     | 40    | חבר   | 40  |

data/examples/i18n/he/features/division.feature

@@ -0,0 +1,9 @@
+תכונה: חילוק
+  כדי למנוע טעויות טפשיות
+  לקופאים חייבת להיות יכולת לחשב שבר
+
+  תרחיש: מספרים רגילים
+    בהינתן שהזנתי 3 למחשבון
+    וגם שהזנתי 2 למחשבון
+    כאשר אני לוחץ על חלק
+    אז התוצאה על המסך צריכה להיות 1.5

data/examples/i18n/he/features/step_definitons/calculator_steps.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+require 'spec/expectations'
+$:.unshift(File.dirname(__FILE__) + '/../../lib') # This line is not needed in your own project
+require 'cucumber/formatter/unicode'
+require 'calculator'
+
+Before do
+  @calc = Calculator.new
+end
+
+After do
+end
+
+Given /שהזנתי (\d+) למחשבון/ do |n|
+  @calc.push n.to_i
+end
+
+When /אני לוחץ על (\w+)/ do |op|
+  @result = @calc.send op
+end
+
+Then /התוצאה על המסך צריכה להיות (.*)/ do |result|
+  @result.should == result.to_f
+end

data/examples/i18n/he/lib/calculator.rb

@@ -0,0 +1,14 @@
+class Calculator
+  def push(n)
+    @args ||= []
+    @args << n
+  end
+
+  def חבר
+    @args.inject(0){|n,sum| sum+=n}
+  end
+
+  def חלק
+    @args[0].to_f / @args[1].to_f
+  end
+end

data/examples/self_test/features/search_sample.feature

@@ -20,3 +20,13 @@ Feature: search examples
     Examples:
       |state|
       |passing|
+  
+  Scenario Outline: no match in name but in examples
+    Given <state> without a table
+    Examples: Hantu Pisang
+      |state|
+      |passing|
+
+    Examples: Ignore me
+      |state|
+      |failing|

data/examples/watir/features/search.feature

@@ -6,4 +6,7 @@ Feature: Search
   Scenario: Find what I'm looking for
     Given I am on the Google search page
     When I search for "cucumber github"
-    Then I should see a link to "Ruby on Rails — cucumber — GitHub":http://github.com/aslakhellesoy/cucumber/wikis/ruby-on-rails
+    Then I should see
+      """
+      BDD that talks to domain experts first and code second
+      """

data/examples/watir/features/step_definitons/search_steps.rb

@@ -10,10 +10,8 @@ When /I search for "(.*)"/ do |query|
   @browser.button(:name, 'btnG').click
 end
 
-Then /I should see a link to "(.*)":(.*)/ do |text, url|
-  link = @browser.link(:url, url)
-  link.should_not == nil
-  link.text.should == text
+Then /I should see/ do |text|
+  @browser.text.should =~ /#{text}/m
 end
 
 # To avoid step definitions that are tightly coupled to your user interface,

data/features/cucumber_cli.feature

@@ -281,6 +281,17 @@ Feature: Cucumber command line
             | state   |
             | passing |
 
+        Scenario Outline: no match in name but in examples
+          Given <state> without a table
+
+          Examples: Hantu Pisang
+            | state   |
+            | passing |
+
+          Examples: Ignore me
+            | state   |
+            | failing |
+
       Feature: undefined multiline args
       
         Scenario: pystring
@@ -293,9 +304,9 @@ Feature: Cucumber command line
           Given a table
             | table   |
             | example |
-
-      21 scenarios (15 skipped, 5 undefined, 1 passed)
-      35 steps (26 skipped, 9 undefined)
+      
+      23 scenarios (17 skipped, 5 undefined, 1 passed)
+      39 steps (30 skipped, 9 undefined)
 
       """
 
@@ -344,8 +355,15 @@ Feature: Cucumber command line
             | state   |
             | passing |
 
-      2 scenarios (2 passed)
-      4 steps (4 passed)
+        Scenario Outline: no match in name but in examples
+          Given <state> without a table
+
+          Examples: Hantu Pisang
+            | state   |
+            | passing |
+
+      3 scenarios (3 passed)
+      6 steps (6 passed)
 
       """
 

data/features/rake_task.feature

@@ -123,3 +123,28 @@ Feature: Rake task
       """
       Cucumber::Rake::Task#feature_list is deprecated and will be removed in 0.4.0.  Please use profiles for complex settings: http://wiki.github.com/aslakhellesoy/cucumber/using-rake#profiles
       """
+
+  Scenario: respect requires
+    Given a file named "features/support/env.rb"
+    And a file named "features/support/dont_require_me.rb"
+    And the following profile is defined:
+      """
+      no_bomb: features/missing_step_definitions.feature:3 --require features/support/env.rb --verbose
+      """
+    And a file named "Rakefile" with:
+      """
+      $LOAD_PATH.unshift(CUCUMBER_LIB)
+      require 'cucumber/rake/task'
+
+      Cucumber::Rake::Task.new(:features) do |t|
+        t.profile = "no_bomb"
+        t.cucumber_opts = "--quiet --no-color"
+      end
+      """
+
+    When I run rake features
+    Then it should pass
+    And the output should not contain
+      """
+        * features/support/dont_require_me.rb
+      """

data/features/step_definitions/cucumber_steps.rb

@@ -10,6 +10,10 @@ Given /^a standard Cucumber project directory structure$/ do
   end
 end
 
+Given /^a file named "([^\"]*)"$/ do |file_name|
+  create_file(file_name, '')
+end
+
 Given /^a file named "([^\"]*)" with:$/ do |file_name, file_content|
   create_file(file_name, file_content)
 end
@@ -43,6 +47,10 @@ Then /^the output should contain$/ do |text|
   last_stdout.should include(text)
 end
 
+Then /^the output should not contain$/ do |text|
+  last_stdout.should_not include(text)
+end
+
 Then /^"(.*)" should contain$/ do |file, text|
   IO.read(file).should == text
 end

data/features/usage.feature

@@ -18,6 +18,7 @@ Feature: Cucumber command line
        Given passing without a table       # features/search_sample.feature:4
        Given passing without a table       # features/search_sample.feature:7
        Given <state> without a table       # features/search_sample.feature:19
+       Given <state> without a table       # features/search_sample.feature:25
       /^failing without a table$/    # features/step_definitions/sample_steps.rb:15
        Given failing without a table # features/background/failing_background.feature:5
        Given failing without a table # features/background/scenario_outline_failing_background.feature:4

data/lib/cucumber/formatter/progress.rb

@@ -18,18 +18,14 @@ module Cucumber
         print_summary
       end
 
-      def visit_multiline_arg(multiline_arg)
-        @multiline_arg = true
-        super
-        @multiline_arg = false
-      end
-
-      def visit_step_name(keyword, step_match, status, source_indent, background)
-        progress(status) unless status == :outline
+      def visit_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
+        progress(status)
+        @status = status
       end
 
       def visit_table_cell_value(value, width, status)
-        progress(status) if (status != :thead) && !@multiline_arg
+        status ||= @status
+        progress(status) unless table_header_cell?(status)
       end
 
       private
@@ -55,6 +51,9 @@ module Cucumber
         @io.flush
       end
       
+      def table_header_cell?(status)
+        status == :skipped_param
+      end
     end
   end
 end

data/lib/cucumber/languages.yml

@@ -206,6 +206,21 @@
   and: Et
   but: Mais
   space_after_keyword: true
+"he":
+  name: Hebrew
+  native: עברית
+  encoding: UTF-8
+  feature: תכונה
+  background: רקע
+  scenario: תרחיש
+  scenario_outline: תבנית תרחיש
+  examples: דוגמאות
+  given: בהינתן
+  when: כאשר
+  then: אז|אזי
+  and: וגם
+  but: אבל
+  space_after_keyword: true
 "hu":
   name: Hungarian
   native: magyar
@@ -482,4 +497,4 @@
   then: То
   and: И
   but: Но
-  space_after_keyword: true  
+  space_after_keyword: true

data/lib/cucumber/parser/feature.rb

@@ -827,6 +827,10 @@ module Cucumber
         end
 
         def matches_name?(regexp_to_match)
+          outline_matches_name?(regexp_to_match) || examples_sections.matches_name?(regexp_to_match)
+        end
+
+        def outline_matches_name?(regexp_to_match)
           name.build =~ regexp_to_match
         end
 
@@ -1088,9 +1092,13 @@ module Cucumber
           elements.detect { |e| e.at_line?(line) }
         end
 
+        def matches_name?(regexp_to_match)
+          elements.detect { |e| e.matches_name?(regexp_to_match) }
+        end
+
         def build(filter, scenario_outline)
           elements.map do |e|
-            if(filter.nil? || filter.accept?(e) || filter.outline_at_line?(scenario_outline))
+            if(filter.nil? || filter.accept_example?(e, scenario_outline))
               e.build(filter, scenario_outline)
             end
           end.compact

data/lib/cucumber/parser/feature.tt

@@ -165,6 +165,10 @@ module Cucumber
           end
 
           def matches_name?(regexp_to_match)
+            outline_matches_name?(regexp_to_match) || examples_sections.matches_name?(regexp_to_match)
+          end
+
+          def outline_matches_name?(regexp_to_match)
             name.build =~ regexp_to_match
           end
 
@@ -218,9 +222,13 @@ module Cucumber
             elements.detect { |e| e.at_line?(line) }
           end
 
+          def matches_name?(regexp_to_match)
+            elements.detect { |e| e.matches_name?(regexp_to_match) }
+          end
+
           def build(filter, scenario_outline)
             elements.map do |e|
-              if(filter.nil? || filter.accept?(e) || filter.outline_at_line?(scenario_outline))
+              if(filter.nil? || filter.accept_example?(e, scenario_outline))
                 e.build(filter, scenario_outline)
               end
             end.compact

data/lib/cucumber/parser/treetop_ext.rb

@@ -26,6 +26,11 @@ module Cucumber
         matches_names?(syntax_node)
       end
 
+      def accept_example?(syntax_node, outline)
+        (at_line?(syntax_node) || outline_at_line?(outline)) && 
+        (matches_names?(syntax_node) || outline_matches_names?(outline))
+      end
+      
       def at_line?(syntax_node)
         @lines.nil? || @lines.empty? || @lines.detect{|line| syntax_node.at_line?(line)}
       end
@@ -47,6 +52,10 @@ module Cucumber
         @exclude_tags.any? && syntax_node.has_tags?(@exclude_tags)
       end
       
+      def outline_matches_names?(syntax_node)
+        @name_regexps.nil? || @name_regexps.empty? || @name_regexps.detect{|name_regexp| syntax_node.outline_matches_name?(name_regexp)}
+      end
+      
       def matches_names?(syntax_node)
         @name_regexps.nil? || @name_regexps.empty? || @name_regexps.detect{|name_regexp| syntax_node.matches_name?(name_regexp)}
       end

data/lib/cucumber/rake/task.rb

@@ -62,6 +62,8 @@ module Cucumber
       def profile=(profile)
         @profile = profile
         unless feature_list
+          # TODO: remove once we completely remove these from the rake task.
+          @step_list = []
           @feature_list = [] # Don't use accessor to avoid deprecation warning.
         end
       end

data/lib/cucumber/version.rb

@@ -2,8 +2,8 @@ module Cucumber #:nodoc:
   class VERSION #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 1
-    PATCH = 1 # Set to nil for official release
+    TINY  = 2
+    PATCH = nil # Set to nil for official release
 
     STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
   end

data/spec/cucumber/formatter/progress_spec.rb

@@ -0,0 +1,35 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+module Cucumber
+  module Formatter
+    describe Progress do
+
+      before(:all) do
+        Term::ANSIColor.coloring = false
+      end
+
+      before(:each) do
+        @out = StringIO.new
+        @progress = Progress.new(mock("step mother"), @out, {})
+      end
+
+      describe "visiting a table cell value without a status" do
+        it "should take the status from the last run step" do
+          @progress.visit_step_result('', '', nil, :failed, nil, 10, nil)
+          @progress.visit_table_cell_value('value', 10, nil)
+
+          @out.string.should == "FF"
+        end
+      end
+
+      describe "visiting a table cell which is a table header" do
+        it "should not output anything" do
+          @progress.visit_table_cell_value('value', 10, :skipped_param)
+
+          @out.string.should == ""
+        end
+      end
+
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aslakhellesoy-cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.3.1.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-28 00:00:00 -07:00
+date: 2009-05-03 00:00:00 -07:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -144,6 +144,11 @@ files:
 - examples/i18n/fr/features/addition.feature
 - examples/i18n/fr/features/step_definitions/calculatrice_steps.rb
 - examples/i18n/fr/lib/calculatrice.rb
+- examples/i18n/he/Rakefile
+- examples/i18n/he/features/addition.feature
+- examples/i18n/he/features/division.feature
+- examples/i18n/he/features/step_definitons/calculator_steps.rb
+- examples/i18n/he/lib/calculator.rb
 - examples/i18n/hu/Rakefile
 - examples/i18n/hu/features/addition.feature
 - examples/i18n/hu/features/division.feature
@@ -418,6 +423,7 @@ files:
 - spec/cucumber/formatter/html/index.html
 - spec/cucumber/formatter/html/jquery-1.3.min.js
 - spec/cucumber/formatter/html/jquery.uitableedit.js
+- spec/cucumber/formatter/progress_spec.rb
 - spec/cucumber/parser/feature_parser_spec.rb
 - spec/cucumber/parser/table_parser_spec.rb
 - spec/cucumber/rails/stubs/mini_rails.rb