aslakhellesoy-cucumber 0.1.12 → 0.1.13

data/History.txt

@@ -1,3 +1,38 @@
+== 0.1.13 2008-12-20
+
+It's time for some new features again. Output is now much better since you can use diffing, tweak
+the output colours and get the full --backtrace if you want. Managing your support/* files became 
+a little easier since they are now always loaded before the step definitions. Life became easier 
+for Windows users in Norway (and other countries using unicode in the features). Plus several other 
+bug fixes.
+
+Enjoy!
+
+=== New features
+* Console output is no longer bold, but regular. Step arguments are bold instead of blold+underlined. (Aslak Hellesøy)
+* Console output can be configured with CUCUMBER_COLORS in your shell. (Aslak Hellesøy)
+* Added new --backtrace option to show full backtrace (Aslak Hellesøy)
+* Enable RSpec's diffing automatically if RSpec is loaded (Aslak Hellesøy)
+* Files in support directories are loaded before any other file (i.e. step definitions.)  (#120, Ben Mabey)
+* The Rails features generator got some love and is now tested: http://github.com/aslakhellesoy/cucumber_rails (Aslak Hellesøy)
+* --language is aliased to -l instead of -a (-l became available when --line was refactored) (Aslak Hellesøy)
+* Scenario Outlines which through placeholders in the steps allow control of how scenario table values are used. (#57 Joseph Wilk)
+* Scenario Outlines are now usable in pure ruby (Joseph Wilk)
+* Add support for calling 'pending' from step definitions. (#112 Joseph Wilk)
+
+=== Bugfixes
+* Make rails before filters work correctly (#122, #129 Guillermo Álvarez Fernández)
+* Proper Unicode support for Windows command shells: Just require cucumber/formatter/unicode in env.rb (Aslak Hellesøy)
+* Fixed disappearing "a" on Windows (#81 Aslak Hellesøy)
+* Fixed a bug where row step outlines were loosing step tables. (#121 Joseph Wilk, Ben Mabey)
+* The Cucumber Autotest plugin now launches JRuby if autotest is run with JRuby (Aslak Hellesøy)
+* Provide helpful and non-confusing error message when specified profile is blank. (#118, Ben Mabey)
+* Improve handling and error messages for malformed cucumber.yml files. (#117, Ben Mabey) 
+* document :x run option in command line help (#114, Aslak Hellesøy)
+* Change 'visits' to 'visit' in features generator to comply with new Webrat API (Darius Roberts)
+
+=== Removed features
+
 == 0.1.12 2008-12-04
 
 This is the "getting serious with IronRuby release" - largely based on 
@@ -17,18 +52,18 @@ None
 
 Bugfix release with a couple of minor additional features to the command line options.
 
-== New features
+=== New features
 * Capture output from cucumber in Autotest (Alan Larkin)
 * Update cucumber generator to work with latest Webrat (Bryan Helkamp)
 * CUCUMBR LIKEZ 2 SPEEK WIF KATS. KTHXBAI (Aimee Daniells)
 * Support for dynamically pluggable formatters (#99 Joseph Wilk)
 * --verbose mode to see ruby files and feature files loaded by Cucumber (#106 Joseph Wilk)
 
-== Bugfixes
+=== Bugfixes
 * The jcode library is not loaded on JRuby/Rails. Workaround for http://tinyurl.com/55uu3u. (Aslak Hellesøy)
 * Support including modules for class passed to --format (#109 Joseph Wilk)
 
-== Removed features
+=== Removed features
 * The cucumber gem no longer depends on the rspec gem. It must be downloaded manually if RSpec is used. (Jeff Rafter)
 
 == 0.1.10 2008-11-25

data/Manifest.txt

@@ -3,7 +3,6 @@ License.txt
 Manifest.txt
 README.txt
 Rakefile
-TODO.txt
 bin/cucumber
 config/hoe.rb
 config/requirements.rb
@@ -106,6 +105,10 @@ examples/test_unit/features/step_definitions/test_unit_steps.rb
 examples/test_unit/features/test_unit.feature
 examples/tickets/Rakefile
 examples/tickets/cucumber.yml
+examples/tickets/features/lib/eatting_machine.rb
+examples/tickets/features/lib/pantry.rb
+examples/tickets/features/scenario_outline.feature
+examples/tickets/features/step_definitons/scenario_outline_steps.rb
 examples/tickets/features/step_definitons/tickets_steps.rb
 examples/tickets/features/tickets.feature
 examples/watir/Rakefile
@@ -121,6 +124,7 @@ gem_tasks/flog.rake
 gem_tasks/gemspec.rake
 gem_tasks/rspec.rake
 gem_tasks/treetop.rake
+gem_tasks/yard.rake
 lib/autotest/cucumber.rb
 lib/autotest/cucumber_mixin.rb
 lib/autotest/cucumber_rails.rb
@@ -130,6 +134,7 @@ lib/autotest/discover.rb
 lib/cucumber.rb
 lib/cucumber/broadcaster.rb
 lib/cucumber/cli.rb
+lib/cucumber/core_ext/exception.rb
 lib/cucumber/core_ext/proc.rb
 lib/cucumber/core_ext/string.rb
 lib/cucumber/executor.rb
@@ -143,6 +148,7 @@ lib/cucumber/formatters/jquery.js
 lib/cucumber/formatters/pretty_formatter.rb
 lib/cucumber/formatters/profile_formatter.rb
 lib/cucumber/formatters/progress_formatter.rb
+lib/cucumber/formatters/unicode.rb
 lib/cucumber/languages.yml
 lib/cucumber/model.rb
 lib/cucumber/model/table.rb
@@ -186,6 +192,8 @@ lib/cucumber/treetop_parser/feature_ru.rb
 lib/cucumber/treetop_parser/feature_se.rb
 lib/cucumber/treetop_parser/feature_zh-CN.rb
 lib/cucumber/version.rb
+lib/cucumber/world.rb
+lib/cucumber/world/pending.rb
 rails_generators/cucumber/USAGE
 rails_generators/cucumber/cucumber_generator.rb
 rails_generators/cucumber/templates/cucumber
@@ -224,18 +232,26 @@ spec/cucumber/rails/world_spec.rb
 spec/cucumber/sell_cucumbers.feature
 spec/cucumber/step_mother_spec.rb
 spec/cucumber/tree/feature_spec.rb
+spec/cucumber/tree/row_scenario_outline_spec.rb
 spec/cucumber/tree/row_scenario_spec.rb
+spec/cucumber/tree/row_step_outline_spec.rb
+spec/cucumber/tree/scenario_outline_spec.rb
 spec/cucumber/tree/scenario_spec.rb
+spec/cucumber/tree/step_outline_spec.rb
 spec/cucumber/tree/step_spec.rb
 spec/cucumber/treetop_parser/empty_feature.feature
 spec/cucumber/treetop_parser/empty_scenario.feature
+spec/cucumber/treetop_parser/empty_scenario_outline.feature
 spec/cucumber/treetop_parser/feature_parser_spec.rb
 spec/cucumber/treetop_parser/fit_scenario.feature
 spec/cucumber/treetop_parser/given_scenario.feature
+spec/cucumber/treetop_parser/invalid_scenario_outlines.feature
 spec/cucumber/treetop_parser/multiline_steps.feature
 spec/cucumber/treetop_parser/multiple_tables.feature
+spec/cucumber/treetop_parser/scenario_outline.feature
 spec/cucumber/treetop_parser/spaces.feature
 spec/cucumber/treetop_parser/test_dos.feature
 spec/cucumber/treetop_parser/with_comments.feature
+spec/cucumber/world/pending_spec.rb
 spec/spec.opts
 spec/spec_helper.rb

data/README.txt

@@ -1,41 +1,4 @@
 = Cucumber
 
-* http://github.com/aslakhellesoy/cucumber
-
-== DESCRIPTION:
-
-Cucumber executes plain text documentation of code against that code.
-Documentation: http://github.com/aslakhellesoy/cucumber/wikis/home
-
-== REQUIREMENTS:
-
-* FIX (list of requirements)
-
-== INSTALL:
-
-* gem install cucumber
-
-== LICENSE:
-
-(The MIT License)
-
-Copyright (c) 2008 Aslak Hellesøy
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Please see the "wiki":http://github.com/aslakhellesoy/cucumber/wikis/home
+for documentation.

data/bin/cucumber

@@ -3,4 +3,4 @@
 $:.unshift(File.dirname(__FILE__ + '.rb') + '/../lib') unless $:.include?(File.dirname(__FILE__ + '.rb') + '/../lib')
 
 require 'cucumber/cli'
-Cucumber::CLI.execute
+Cucumber::CLI.execute(ARGV)

data/examples/calculator_ruby_features/features/addition.rb

@@ -20,4 +20,20 @@ Feature %|Addition
       t | n         | n*2       | n*3      | Fixnum   | t
     end
   end
+  
+  ScenarioOutline "Add two numbers" do
+    Given "I have entered <input_1> into the calculator"
+    And "I have entered <input_2> into the calculator"
+    When "I add"
+    Then "the result should be <output> on the screen"
+    And "the result class should be <class>"
+  end
+  
+  Table do |t|
+    t | "input_1" | "input_2" | "output" | "class"  | t
+    10.times do |n|
+      t | n         | n*2       | n*3      | Fixnum   | t
+    end
+  end
+  
 end

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

@@ -1,6 +1,6 @@
-$KCODE='u'
 require 'spec'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
+require 'cucumber/formatters/unicode'
 require 'calculator'
 
 Before do

data/examples/i18n/da/features/step_definitons/kalkulator_steps.rb

@@ -1,5 +1,6 @@
 require 'spec'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
+require 'cucumber/formatters/unicode'
 require 'kalkulator'
 
 Before do

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

@@ -1,5 +1,6 @@
 require 'spec'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
+require 'cucumber/formatters/unicode'
 require 'calculator'
 
 Before do

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

@@ -1,5 +1,6 @@
 require 'spec'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
+require 'cucumber/formatters/unicode'
 require 'calculator'
 
 Before do

data/examples/i18n/es/features/step_definitons/calculador_steps.rb

@@ -1,5 +1,6 @@
 require 'spec'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
+require 'cucumber/formatters/unicode'
 require 'calculador'
 
 Before do

data/examples/i18n/et/features/step_definitions/kalkulaator_steps.rb

@@ -1,5 +1,6 @@
 require 'spec'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
+require 'cucumber/formatters/unicode'
 require 'kalkulaator'
 
 Before do

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

@@ -1,13 +1,15 @@
-Fonction: Addition
-  Afin d'eviter des conneries
-  Etant un comptable
-  Je désire additionner deux chiffres
+Fonctionnalité: Addition
+  Afin de financer mon bonus avec l'argent des pigeons
+  En tant que trader
+  Je souhaite pouvoir additionner 2 chiffres
 
-  Scenario: 7 et 5
-    Soit que j'ai entré 5
-    Et que j'ai entré 7
-    
-  Scenario: Additionner
-    SoitScenario: 7 et 5
+  Scénario: Addition de produits dérivés
+    Etant donné que je tape 2
+    Et que je tape 1
     Lorsque je tape additionner
-    Alors le reultat doit être 12
+    Alors le résultat doit être 3
+
+  Plus d'exemples:
+    | a | b | sum |
+    | 2 | 2 | 4   |
+    | 2 | 3 | 5   |

data/examples/i18n/fr/features/step_definitions/calculatrice_steps.rb

@@ -1,5 +1,6 @@
 require 'spec'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
+require 'cucumber/formatters/unicode'
 require 'calculatrice'
 
 Before do
@@ -9,14 +10,17 @@ end
 After do
 end
 
-Given /que j'ai entré (\d+)/ do |n|
+# Etant donné que je tape ...
+Given /que je tape (\d+)/ do |n|
   @calc.push n.to_i
 end
 
+# Lorsque je tape additionner
 When 'je tape additionner' do
   @result = @calc.additionner
 end
 
-Then /le reultat doit être (\d*)/ do |result|
+# Alors le résultat doit être ...
+Then /le résultat doit être (\d*)/ do |result|
   @result.should == result.to_i
 end

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

@@ -1,5 +1,6 @@
 require 'spec'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
+require 'cucumber/formatters/unicode'
 require 'calculator'
 
 Before do

data/examples/i18n/it/features/step_definitons/calcolatrice_steps.rb

@@ -1,5 +1,6 @@
 require 'spec'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
+require 'cucumber/formatters/unicode'
 require 'calcolatrice'
 
 Before do

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

@@ -1,5 +1,7 @@
 require 'spec'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
+require 'cucumber/formatters/unicode'
+$KCODE = 'e'
 require 'calculator'
 
 Before do

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

@@ -1,5 +1,6 @@
 require 'spec'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
+require 'cucumber/formatters/unicode'
 require 'calculator'
 
 Before do

data/examples/i18n/no/features/step_definitons/kalkulator_steps.rb

@@ -1,5 +1,6 @@
 require 'spec'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
+require 'cucumber/formatters/unicode'
 require 'kalkulator'
 
 Before do

data/examples/i18n/pt/features/step_definitions/calculadora_steps.rb

@@ -1,5 +1,6 @@
 require 'spec'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
+require 'cucumber/formatters/unicode'
 require 'calculadora'
 
 Before do

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

@@ -1,5 +1,6 @@
 require 'spec'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
+require 'cucumber/formatters/unicode'
 require 'calculator'
 
 Before do

data/examples/i18n/se/features/step_definitons/kalkulator_steps.rb

@@ -1,5 +1,6 @@
 require 'spec'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
+require 'cucumber/formatters/unicode'
 require 'kalkulator'
 
 Before do

data/examples/i18n/zh-CN/features/step_definitons/calculator_steps.rb

@@ -1,5 +1,6 @@
 require 'spec'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
+require 'cucumber/formatters/unicode'
 require 'calculator'
 
 Before do

data/examples/selenium/features/search.feature

@@ -6,4 +6,4 @@ Feature: Search
   Scenario: Find what I'm looking for
     Given I am on the Google search page
     When I search for "rspec"
-    Then I should see a link to "RSpec-1.1.4: Overview":http://rspec.info/
+    Then I should see a link to http://rspec.info/

data/examples/selenium/features/step_definitons/stories_steps.rb

@@ -35,7 +35,6 @@ When /I search for "(.*)"/ do |query|
   @page.search(query)
 end
 
-Then /I should see a link to "(.*)":(.*)/ do |text, expected_url|
-  observed_url = @browser.get_attribute("link=#{text}@href")
-  observed_url.should == expected_url
+Then /I should see a link to (.*)/ do |expected_url|
+  @browser.is_element_present("css=a[href='#{expected_url}']").should be_true
 end

data/examples/tickets/features/lib/eatting_machine.rb

@@ -0,0 +1,18 @@
+class EattingMachine
+  
+  attr_reader :fruit_total, :belly_count
+  attr_accessor :belly_count
+  
+  def initialize(fruit_name, fruit_total)
+    @fruit_name = fruit_name
+    @fruit_total = fruit_total.to_i
+    @belly_count = 0
+  end
+    
+  def eat(count)
+    count = count.to_i
+    @fruit_total = @fruit_total - count
+    @belly_count += count
+  end
+      
+end

data/examples/tickets/features/lib/pantry.rb

@@ -0,0 +1,20 @@
+class Pantry
+
+  def initialize
+    @items = {}
+  end
+
+  def add(food_name, count)
+    @items[food_name] ||= 0
+    @items[food_name] += count.to_i
+  end
+
+  def remove(food_name, count)
+    @items[food_name] -= count.to_i
+  end
+
+  def count(food_name)
+    @items[food_name]
+  end
+
+end

data/examples/tickets/features/scenario_outline.feature

@@ -0,0 +1,64 @@
+Feature: Outlines
+  In order to re-use scenario table values
+  As a citizen of Cucumbia
+  I want to explicitly mark the parameters in a scenario outline
+
+  Scenario Outline: controlling order
+    Given there are <start> cucumbers
+    When I eat <eat> cucumbers
+    Then I should have <left> cucumbers
+
+  Examples:
+    | left  | start  | eat  |
+    |  7    |  12    |  5   |
+    |  15   |  20    |  5   |
+    
+  Scenario Outline: reusing place holder
+    Given there are <start> cucumbers
+    When I eat <eat> cucumbers
+    Then I should have <left> cucumbers
+    And I should have <eat> cucumbers in my belly
+
+  Examples:
+    | start  | eat  | left |
+    |  12    |  5   |  7   |
+    |  20    |  5   |  15  |
+  
+  Scenario Outline: no placeholders
+    Given there are 12 cucumbers
+    When I eat 5 cucumbers
+    Then I should have 7 cucumbers
+
+  Examples:
+    | start  | eat  | left |
+    |  12    |  5   |  7   |
+    |  20    |  5   |  15  |
+  
+  Scenario Outline: using '<' and '>' not as placeholder
+    Given the belly space is < 12 and > 6
+    And there are <start> cucumbers
+    When I eat <eat> cucumbers
+    Then I should have <left> cucumbers
+
+  Examples:
+    | start  | eat  | left |
+    |  12    |  5   |  7   |
+    |  20    |  5   |  15  |
+
+  Scenario Outline: with step tables
+    Given I have the following fruits in my pantry
+      |    name     | quantity |
+      | cucumbers   |    10    |
+      | strawberrys |    5     |
+      | apricots    |    7     |
+
+    When I eat <number> <fruits> from the pantry
+    Then I should have <left> <fruits> in the pantry
+
+    Examples:
+      | number |   fruits   | left |
+      |   2    | cucumbers  |  8   |
+      |   4    | strawberrys|  1   |
+      |   2    | apricots   |  5   |
+
+

data/examples/tickets/features/step_definitons/scenario_outline_steps.rb

@@ -0,0 +1,34 @@
+Given /^there are (\d+) (\w+)$/ do |count, fruit|
+  @eattingMachine = EattingMachine.new(fruit, count)
+end
+
+Given "the belly space is < 12 and > 6" do
+end
+
+Given "I have the following fruits in my pantry" do |pantry_table|
+  @pantry = Pantry.new
+  pantry_table.hashes.each do |item|
+    @pantry.add(item['name'].downcase, item['quantity'])
+  end
+end
+
+When /^I eat (\d+) (\w+)$/ do |count, fruit|
+  @eattingMachine.eat(count)
+  @eattingMachine.belly_count = count.to_i
+end
+
+When /^I eat (\d+) (\w+) from the pantry$/ do |count, fruit|
+  @pantry.remove(fruit, count.to_i)
+end
+
+Then /^I should have (\d+) (\w+)$/ do |count, fruit|
+  @eattingMachine.fruit_total.should == count.to_i
+end
+
+Then /^I should have (\d+) (\w+) in my belly$/ do |count, fruit|
+  @eattingMachine.belly_count.should == count.to_i
+end
+
+Then /^I should have (\d+) (\w+) in the pantry$/ do |count, fruit|
+  @pantry.count(fruit).should == count.to_i
+end

data/examples/tickets/features/step_definitons/tickets_steps.rb

@@ -1,5 +1,9 @@
 require 'spec'
 
+World do
+  Object.new
+end
+
 Given "be_empty" do
   [1,2].should_not be_empty
 end

data/gem_tasks/fix_cr_lf.rake

@@ -2,7 +2,7 @@ desc 'Make all files use UNIX (\n) line endings'
 task :fix_cr_lf do
   files = FileList['**/*']
   files.each do |f|
-    next if File.directory?(f)
+    next if File.directory?(f) || f =~ /dos/
     s = IO.read(f)
     s.gsub!(/\r?\n/, "\n")
     File.open(f, "w") { |io| io.write(s) }

data/gem_tasks/yard.rake

@@ -0,0 +1,8 @@
+begin
+  require 'yard'
+  
+  YARD::Rake::YardocTask.new do |t|
+    t.files   = ['lib/**/*.rb']
+  end
+rescue LoadError => ignore
+end

data/lib/autotest/cucumber_mixin.rb

@@ -1,5 +1,6 @@
 require 'autotest'
 require 'tempfile'
+require File.dirname(__FILE__) + '/../cucumber/platform'
 
 module Autotest::CucumberMixin
   def self.included(receiver)
@@ -121,11 +122,10 @@ module Autotest::CucumberMixin
     else
       scenario_args = scenarios_to_run.map { |s| "-s '#{s}'" }.join(' ')
     end
-    
-    return "#{cucumber} #{args} #{scenario_args}"
+    return "#{$CUCUMBER_RUBY} #{cucumber} #{args} #{scenario_args}"
   end
   
   def cucumber
-    File.exist?("script/cucumber") ? "script/cucumber" : "cucumber"
+    File.file?("script/cucumber") ? "script/cucumber" : "cucumber"
   end
 end

data/lib/cucumber/broadcaster.rb

@@ -11,7 +11,7 @@ module Cucumber
 
     def method_missing(method_name, *args)
       @receivers.each  do |receiver|
-        r = (receiver == STDOUT) ? Kernel: receiver # Needed to make colors work on Windows
+        r = (receiver == STDOUT) ? Kernel : receiver # Needed to make colors work on Windows
         r.__send__(method_name, *args) if receiver.respond_to?(method_name)
       end
     end