aslakhellesoy-cucumber 0.1.100.3 → 0.1.100.4

data/History.txt

@@ -57,6 +57,9 @@ Scenario Outlines, the rich command line, the nice output format and everything
 pure Ruby users have been enjoying for a while.
 
 == Bugfixes
+* Within Scenario Outlines when replacing with a nil in a step name use empty string instead. (#237 Joseph Wilk) 
+* Fixed bug with Scenario Outlines incorrectly replacing values in step tables with nil. (#237 Joseph Wilk)
+* Within Scenario Outlines when replacing with a nil in multiline strings use empty string instead. (#238 Joseph Wilk)
 * Re-structure the ast: Feature -> Background -> (Scenario|ScenarioOutline)*. Fixes bug with background being called outside transactions. (#181 Joseph Wilk)
 * --strict always exits with status 1 (#230 Tim Cuthbertson)
 * Fix error with nil values in tables raising an exception (#227 Joseph Wilk)
@@ -75,6 +78,7 @@ pure Ruby users have been enjoying for a while.
 * Pending steps in > steps called from steps (#65 Aslak Hellesøy)
 
 === New features
+* Australian translation (Josh Graham)
 * Added World#announce(announcment) which lets you output text to the formatted output (#222 Rob Kaufmann)
 * Added Table#transpose to to allow use of vertically aligned table keys (Torbjørn Vatn, Aslak Hellesøy)
 * Added Table#map_headers to to allow use of more readable headers (Rob Holland)

data/Manifest.txt

@@ -30,6 +30,12 @@ examples/i18n/de/features/addition.feature
 examples/i18n/de/features/division.feature
 examples/i18n/de/features/step_definitons/calculator_steps.rb
 examples/i18n/de/lib/calculator.rb
+examples/i18n/en-lol/Rakefile
+examples/i18n/en-lol/features/step_definitions/cucumbrz_steps.rb
+examples/i18n/en-lol/features/stuffing.feature
+examples/i18n/en-lol/features/support/env.rb
+examples/i18n/en-lol/lib/basket.rb
+examples/i18n/en-lol/lib/belly.rb
 examples/i18n/en/Rakefile
 examples/i18n/en/features/addition.feature
 examples/i18n/en/features/division.feature

data/examples/i18n/en-lol/Rakefile

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

data/examples/i18n/en-lol/features/step_definitions/cucumbrz_steps.rb

@@ -0,0 +1,16 @@
+ICANHAZ /^IN TEH BEGINNIN (\d+) CUCUMBRZ$/ do |n|
+  @basket = Basket.new(n.to_i)
+end
+
+WEN /^I EAT (\d+) CUCUMBRZ$/ do |n|
+  @belly = Belly.new
+  @belly.eat(@basket.take(n.to_i))
+end
+
+DEN /^I HAS (\d+) CUCUMBERZ IN MAH BELLY$/ do |n|
+  @belly.cukes.should == n.to_i
+end
+
+AN /^IN TEH END (\d+) CUCUMBRZ KTHXBAI$/ do |n|
+  @basket.cukes.should == n.to_i
+end

data/examples/i18n/en-lol/features/stuffing.feature

@@ -0,0 +1,8 @@
+# stuffing.feature
+OH HAI: STUFFING
+
+  MISHUN: CUCUMBR
+    I CAN HAZ IN TEH BEGINNIN 3 CUCUMBRZ
+    WEN I EAT 2 CUCUMBRZ
+    DEN I HAS 2 CUCUMBERZ IN MAH BELLY
+    AN IN TEH END 1 CUCUMBRZ KTHXBAI

data/examples/i18n/en-lol/features/support/env.rb

@@ -0,0 +1,8 @@
+# encoding: utf-8
+$KCODE='u' unless Cucumber::RUBY_1_9
+require 'cucumber/formatter/unicode'
+require 'spec/expectations'
+
+$:.unshift(File.dirname(__FILE__) + '/../../lib')
+require 'basket'
+require 'belly'

data/examples/i18n/en-lol/lib/basket.rb

@@ -0,0 +1,12 @@
+class Basket
+  attr_reader :cukes
+  
+  def initialize(cukes)
+    @cukes = cukes
+  end
+  
+  def take(cukes)
+    @cukes -= cukes
+    cukes
+  end
+end

data/examples/i18n/en-lol/lib/belly.rb

@@ -0,0 +1,11 @@
+class Belly
+  attr_reader :cukes
+  
+  def initialize
+    @cukes = 0
+  end
+  
+  def eat(cukes)
+    @cukes += cukes
+  end
+end

data/examples/tickets/features/236.feature

@@ -0,0 +1,13 @@
+Feature: Unsubstituted argument placeholder 
+
+  Scenario Outline: See Annual Leave Details (as Management & Human Resource)
+   Given the following users exist in the system
+     | name   | email           | role_assignments | group_memberships |
+     | Jane   | jane@fmail.com  | <role>           | Sales (manager)   |
+     | Max    | max@fmail.com   |                  | Sales (member)    |
+     | Carol  | carol@fmail.com |                  | Sales (member)    |
+     | Cat    | cat@fmail.com   |                  |                   |
+
+   Examples:
+     | role           |
+     | HUMAN RESOURCE |

data/lib/cucumber/ast/py_string.rb

@@ -42,6 +42,7 @@ module Cucumber
       def arguments_replaced(arguments) #:nodoc:
         string = @string
         arguments.each do |name, value|
+          value ||= ''
           string = string.gsub(name, value)
         end
         PyString.new(@start_line, @end_line, string, @quotes_indent)

data/lib/cucumber/ast/step.rb

@@ -112,6 +112,7 @@ module Cucumber
       def replace_name_arguments(argument_hash)
         name_with_arguments_replaced = @name
         argument_hash.each do |name, value|
+          value ||= ''
           name_with_arguments_replaced = name_with_arguments_replaced.gsub(name, value) if value
         end
         name_with_arguments_replaced

data/lib/cucumber/ast/table.rb

@@ -158,7 +158,9 @@ module Cucumber
           row.map do |cell|
             cell_with_replaced_args = cell
             arguments.each do |name, value|
-              cell_with_replaced_args = value && cell_with_replaced_args ? cell_with_replaced_args.gsub(name, value) : nil
+              if cell_with_replaced_args && cell_with_replaced_args.include?(name)
+                cell_with_replaced_args = value ? cell_with_replaced_args.gsub(name, value) : nil
+              end
             end
             cell_with_replaced_args
           end

data/lib/cucumber/formatter/rerun.rb

@@ -27,7 +27,7 @@ module Cucumber
         end
       end
 
-      def visit_step_name(keyword, step_match, status, source_indent)
+      def visit_step_name(keyword, step_match, status, source_indent, background)
         @rerun = true if [:failed].index(status)
       end
     end

data/lib/cucumber/languages.yml

@@ -20,6 +20,7 @@
   then: Then
   and: And
   but: But
+
 # Please help us keeping the languages below uptodate. The parsers for a language
 # that is missing a keyword will expect the English word until the missing word(s)
 # are added.
@@ -94,6 +95,20 @@
   then: Dann
   and: Und
   but: Aber
+"en-au":
+  name: Australian
+  native: Australian
+  encoding: UTF-8
+  feature: Crikey
+  background: Background
+  scenario: Mate
+  scenario_outline: Blokes
+  examples: Cobber
+  given: Ya know how
+  when: When
+  then: Ya gotta
+  and: N
+  but: Cept
 "en-lol":
   name: LOLCAT
   native: LOLCAT
@@ -103,7 +118,7 @@
   scenario: MISHUN
   scenario_outline: MISHUN SRSLY
   examples: EXAMPLZ
-  given: GIVN
+  given: I CAN HAZ
   when: WEN
   then: DEN
   and: AN
@@ -115,7 +130,7 @@
   feature: Feature
   background: Background
   scenario: Scenario
-  scenario_outline: Scenario Outline
+  scenario_outline: All y'all
   examples: Examples
   given: Given y'all
   when: When y'all

data/lib/cucumber/rake/task.rb

@@ -51,7 +51,7 @@ module Cucumber
       # Define a Rake
       def initialize(task_name = "features", desc = "Run Features with Cucumber")
         @task_name, @desc = task_name, desc
-        @libs = []
+        @libs = ['lib']
         @rcov_opts = %w{--rails --exclude osx\/objc,gems\/}
 
         yield self if block_given?

data/lib/cucumber/step_mother.rb

@@ -51,6 +51,7 @@ module Cucumber
   module StepMother
     class << self
       def alias_adverb(adverb)
+        adverb = adverb.gsub(/\s/, '')
         alias_method adverb, :register_step_definition
       end
     end

data/lib/cucumber/version.rb

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

data/spec/cucumber/ast/py_string_spec.rb

@@ -33,6 +33,13 @@ module Cucumber
           @ps.to_s.should_not include("Life is elsewhere")
         end
 
+        it "should replaced nil with empty string" do
+          ps = PyString.new(10, 13, "'<book>'", 0)
+          py_string_with_replaced_arg = ps.arguments_replaced({'<book>' => nil}) 
+          
+          py_string_with_replaced_arg.to_s.should == "''"
+        end
+
       end
       
     end

data/spec/cucumber/ast/step_spec.rb

@@ -19,6 +19,19 @@ module Cucumber
         step_invocation.name.should == 'a green cucumber'
       end
 
+      it "should use empty string for the replacement of arguments in name when replace value is nil" do
+        step = Step.new(1, 'Given', 'a <color>cucumber')
+
+        invocation_table = Table.new([
+          ['color'],
+          [nil]
+        ])
+        cells = invocation_table.cells_rows[1]
+        step_invocation = step.step_invocation_from_cells(cells)
+        
+        step_invocation.name.should == 'a cucumber'
+      end
+
       it "should replace arguments in table arg" do
         arg_table = Table.new([%w{taste_<taste> color_<color>}])
 

data/spec/cucumber/ast/table_spec.rb

@@ -103,6 +103,16 @@ module Cucumber
           table_with_replaced_args.hashes[0]['book'].should == nil
         end
 
+        it "should preserve values which don't match a placeholder when replacing with nil" do
+          table = Table.new([
+                              %w{book},
+                              %w{cat}
+                            ])
+          table_with_replaced_args = table.arguments_replaced({'<book>' => nil})
+          
+          table_with_replaced_args.hashes[0]['book'].should == 'cat'
+        end
+
         it "should not change the original table" do
           @table.arguments_replaced({'<book>' => 'Unbearable lightness of being'})
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aslakhellesoy-cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.1.100.3
+  version: 0.1.100.4
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-16 00:00:00 -07:00
+date: 2009-03-18 00:00:00 -07:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -117,6 +117,12 @@ files:
 - examples/i18n/de/features/division.feature
 - examples/i18n/de/features/step_definitons/calculator_steps.rb
 - examples/i18n/de/lib/calculator.rb
+- examples/i18n/en-lol/Rakefile
+- examples/i18n/en-lol/features/step_definitions/cucumbrz_steps.rb
+- examples/i18n/en-lol/features/stuffing.feature
+- examples/i18n/en-lol/features/support/env.rb
+- examples/i18n/en-lol/lib/basket.rb
+- examples/i18n/en-lol/lib/belly.rb
 - examples/i18n/en/Rakefile
 - examples/i18n/en/features/addition.feature
 - examples/i18n/en/features/division.feature
@@ -214,7 +220,6 @@ files:
 - examples/jbehave/src/main/java/cukes/jbehave/examples/trader/model/Trader.java
 - examples/jbehave/src/main/java/cukes/jbehave/examples/trader/persistence/TraderPersister.java
 - examples/jbehave/src/main/java/cukes/jbehave/examples/trader/scenarios/TraderSteps.java
-- examples/jbehave/target/maven-archiver/pom.properties
 - examples/selenium/Rakefile
 - examples/selenium/features/search.feature
 - examples/selenium/features/step_definitons/search_steps.rb
@@ -257,6 +262,7 @@ files:
 - examples/tickets/features/177/2.feature
 - examples/tickets/features/177/3.feature
 - examples/tickets/features/180.feature
+- examples/tickets/features/236.feature
 - examples/tickets/features/lib/eatting_machine.rb
 - examples/tickets/features/lib/pantry.rb
 - examples/tickets/features/scenario_outline.feature