cucumber 0.1.7 → 0.1.8

data/History.txt

@@ -1,3 +1,84 @@
+== 0.1.8 2008-10-18
+
+This release extends the support for tables. PLEASE NOTE THAT TABLES ARE STILL EXPERIMENTAL.
+In previous releases it has been possible to use tables to define "more examples" of a scenario i
+n a FIT-style column fixture kind of way. Now you can also use tables as arguments to steps.
+
+Tables used to define more examples after a scenario must now be prefixed. In English it looks like this:
+
+  Feature: Addition
+    In order to avoid silly mistakes
+    As a math idiot 
+    I want to be told the sum of two numbers
+
+    Scenario: Add two numbers
+      Given I have entered 50 into the calculator
+      And I have entered 70 into the calculator
+      When I press add
+      Then the result should be 120 on the screen
+      And the result class should be Fixnum
+
+    More Examples:
+      | input_1 | input_2 | button | output | class  |
+      | 20      | 30      | add    | 50     | Fixnum |
+      | 2       | 5       | add    | 7      | Fixnum |
+      | 0       | 40      | add    | 40     | Fixnum |
+
+Languages that are not updated yet will have to use "More Examples" until we get the translations.
+
+Tables can also be used as arguments to individual steps. In fact, steps now support a single argument 
+that can span several lines. This can be a table or a string.
+
+Example:
+
+  Given the following people exist:
+    | name  | email           | phone |
+    | Aslak | aslak@email.com | 123   |
+    | Joe   | joe@email.com   | 234   |
+    | Bryan | bryan@email.org | 234   |
+  When I search for email.com
+  Then I should see:
+    | name  | email           | phone |
+    | Aslak | aslak@email.com | 123   |
+    | Joe   | joe@email.com   | 234   |
+  And I should see:
+    "Some text
+    on several lines"
+
+The step definitions for such multiline steps must define an extra block argument for the argument:
+
+  Given /the following people exist:/ do |people_table|
+    # people_table is of type Cucumber::Model::Table
+    # See RDoc for more info
+  end
+
+  Then /I should see:/ do |string|
+    # string is a plain old ruby String with leading spaces on each line removed
+  end
+
+=== New features
+* Added profile formatter. (#35, Joseph Wilk)
+* Added support for Chinese Simplified. (Liming Lian)
+* Added support for Dutch. (Sjoerd Tieleman)
+* Multiline steps are now supported. (#4, Aslak Hellesøy)
+* Tables used to define more examples for a scenario must be prefixed "More Examples" (see languages.yml for other languages)
+* Show the file and line number for scenarios as a comment when displaying with the pretty formatter. (#40, Joseph Wilk)
+* Show the file for the feature as a comment when displaying with the pretty formatter. (#40, Joseph Wilk)
+* Show the feature file and line for pending steps as a comment when displaying with the pretty formatter. (#40, Joseph Wilk)
+
+=== Bugfixes
+* Fixed speling errors in Spanish (Daniel Cadenas)
+* ActionMailer delivery_method should not be set to test (#41, Luke Melia)
+* Reverse incorrectly ordered args in webrat select step (#43, David Chelimsky)
+* Support comments above the first scenario (#31, Aslak Hellesøy)
+* Fixed the HTML Formatter to use actual values for FIT table headers (#30, Joseph Wilk)
+
+=== Removed features
+* Removed the /^I go to (.*)$/ step from common_webrat.rb - it's not language agnostic and provides little value.
+
+=== New features
+* Added new --out option to make it easier to specify output from Rake and cucumber.yml
+
 == 0.1.7
 
 This release fixes a few bugs and adds some new features. The most notable features are:

data/Manifest.txt

@@ -8,8 +8,8 @@ bin/cucumber
 config/hoe.rb
 config/requirements.rb
 cucumber.yml
+examples/calculator/README.txt
 examples/calculator/Rakefile
-examples/calculator/cucumber.yml
 examples/calculator/features/addition.feature
 examples/calculator/features/division.feature
 examples/calculator/features/steps/calculator_steps.rb
@@ -20,6 +20,10 @@ examples/calculator_ruby_features/features/steps/calculator_steps.rb
 examples/calculatrice_francaise_avec_soit_scenario/Rakefile
 examples/calculatrice_francaise_avec_soit_scenario/features/addition.feature
 examples/calculatrice_francaise_avec_soit_scenario/features/calculatrice_steps.rb
+examples/chinese_simplified_calculator/Rakefile
+examples/chinese_simplified_calculator/features/addition.feature
+examples/chinese_simplified_calculator/features/steps/calculator_steps.rb
+examples/chinese_simplified_calculator/lib/calculator.rb
 examples/cs/README.textile
 examples/cs/Rakefile
 examples/cs/features/hello.feature
@@ -57,7 +61,12 @@ examples/spanish_calculator/Rakefile
 examples/spanish_calculator/features/adicion.feature
 examples/spanish_calculator/features/steps/calculador_steps.rb
 examples/spanish_calculator/lib/Calculador.rb
+examples/swedish_calculator/Rakefile
+examples/swedish_calculator/features/steps/kalkulator_steps.rb
+examples/swedish_calculator/features/summering.feature
+examples/swedish_calculator/lib/kalkulator.rb
 examples/tickets/Rakefile
+examples/tickets/cucumber.yml
 examples/tickets/features/steps/tickets_steps.rb
 examples/tickets/features/tickets.feature
 examples/watir/Rakefile
@@ -73,14 +82,6 @@ gem_tasks/flog.rake
 gem_tasks/gemspec.rake
 gem_tasks/rspec.rake
 gem_tasks/treetop.rake
-generators/cucumber/cucumber_generator.rb
-generators/cucumber/templates/common_webrat.rb
-generators/cucumber/templates/cucumber
-generators/cucumber/templates/cucumber.rake
-generators/cucumber/templates/env.rb
-generators/feature/feature_generator.rb
-generators/feature/templates/feature.erb
-generators/feature/templates/steps.erb
 lib/cucumber.rb
 lib/cucumber/cli.rb
 lib/cucumber/core_ext/proc.rb
@@ -93,8 +94,11 @@ lib/cucumber/formatters/cucumber.js
 lib/cucumber/formatters/html_formatter.rb
 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/languages.yml
+lib/cucumber/model.rb
+lib/cucumber/model/table.rb
 lib/cucumber/rails/rspec.rb
 lib/cucumber/rails/world.rb
 lib/cucumber/rake/task.rb
@@ -115,12 +119,22 @@ lib/cucumber/treetop_parser/feature_en.rb
 lib/cucumber/treetop_parser/feature_es.rb
 lib/cucumber/treetop_parser/feature_et.rb
 lib/cucumber/treetop_parser/feature_fr.rb
+lib/cucumber/treetop_parser/feature_nl.rb
 lib/cucumber/treetop_parser/feature_no.rb
 lib/cucumber/treetop_parser/feature_parser.rb
 lib/cucumber/treetop_parser/feature_pt.rb
 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
+rails_generators/cucumber/cucumber_generator.rb
+rails_generators/cucumber/templates/common_webrat.rb
+rails_generators/cucumber/templates/cucumber
+rails_generators/cucumber/templates/cucumber.rake
+rails_generators/cucumber/templates/env.rb
+rails_generators/feature/feature_generator.rb
+rails_generators/feature/templates/feature.erb
+rails_generators/feature/templates/steps.erb
 script/console
 script/console.cmd
 script/destroy
@@ -138,9 +152,15 @@ spec/cucumber/formatters/ansicolor_spec.rb
 spec/cucumber/formatters/features.html
 spec/cucumber/formatters/html_formatter_spec.rb
 spec/cucumber/formatters/pretty_formatter_spec.rb
+spec/cucumber/formatters/profile_formatter_spec.rb
 spec/cucumber/formatters/progress_formatter_spec.rb
+spec/cucumber/model/table_spec.rb
+spec/cucumber/rails/stubs/mini_rails.rb
+spec/cucumber/rails/stubs/test_help.rb
+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/scenario_spec.rb
 spec/cucumber/tree/step_spec.rb
 spec/cucumber/treetop_parser/empty_feature.feature
@@ -148,6 +168,7 @@ spec/cucumber/treetop_parser/empty_scenario.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/multiline_steps.feature
 spec/cucumber/treetop_parser/multiple_tables.feature
 spec/cucumber/treetop_parser/spaces.feature
 spec/cucumber/treetop_parser/test_dos.feature

data/README.txt

@@ -13,8 +13,7 @@ Documentation: http://github.com/aslakhellesoy/cucumber/wikis/home
 
 == INSTALL:
 
-* gem sources --add http://gems.github.com/ 
-* gem install aslakhellesoy-cucumber
+* gem install cucumber
 
 == LICENSE:
 

data/bin/cucumber

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-$:.unshift(File.dirname(__FILE__) + '/../lib/') unless $:.include?(File.dirname(__FILE__) + '/../lib/')
+$:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
 require 'cucumber/cli'
 Cucumber::CLI.execute

data/examples/calculator/README.txt

@@ -0,0 +1,5 @@
+Run the features with
+
+  rake features
+  
+There is a bug in the calculator. Can you spot it and fix it?

data/examples/calculator/Rakefile

@@ -1,6 +1,5 @@
-$:.unshift(File.dirname(__FILE__) + '/../../lib')
+$:.unshift(File.dirname(__FILE__) + '/../../lib') # If you're running off a Cucumber gem you can skip this line
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = "--profile default"
 end

data/examples/calculator/features/addition.feature

@@ -10,6 +10,7 @@ Feature: Addition
     Then the result should be 120 on the screen
     And the result class should be Fixnum
 
+  More Examples:
     | input_1 | input_2 | button | output | class  |
     | 20      | 30      | add    | 50     | Fixnum |
     | 2       | 5       | add    | 7      | Fixnum |

data/examples/chinese_simplified_calculator/Rakefile

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

data/examples/chinese_simplified_calculator/features/addition.feature

@@ -0,0 +1,17 @@
+功能:加法
+  为了避免一些愚蠢的错误
+  作为一个数学白痴
+  我希望有人告诉我数字相加的结果
+
+  场景: 两个数相加
+    假如我已经在计算器里输入6
+    而且我已经在计算器里输入7
+    当我按相加按钮
+    那么我应该在屏幕上看到的结果是13
+
+  场景: 三个数相加
+    假如我已经在计算器里输入6
+    而且我已经在计算器里输入7
+    而且我已经在计算器里输入1 
+    当我按相加按钮
+    那么我应该在屏幕上看到的结果是14

data/examples/chinese_simplified_calculator/features/steps/calculator_steps.rb

@@ -0,0 +1,24 @@
+require 'spec'
+$:.unshift(File.dirname(__FILE__) + '/../../lib')
+require 'calculator'
+
+Before do
+  @calc = Calculator.new
+end
+
+After do
+end
+
+Given "我已经在计算器里输入$n" do |n|
+  @calc.push n.to_i
+end
+
+When /我按(.*)按钮/ do |op|
+  if op == '相加'
+    @result = @calc.send "add"
+  end
+end
+
+Then /我应该在屏幕上看到的结果是(.*)/ do |result|
+  @result.should == result.to_f
+end

data/examples/chinese_simplified_calculator/lib/calculator.rb

@@ -0,0 +1,10 @@
+class Calculator
+  def push(n)
+    @args ||= []
+    @args << n
+  end
+  
+  def add
+    @args.inject(0){|n,sum| sum+=n}
+  end
+end

data/examples/java/features/steps/hello_steps.rb

@@ -20,6 +20,6 @@ Then /I should remember (\w+) as a friend/ do |name|
   @hello.friend?(name).should == true
 end
 
-Then /I should get (\w+)'s phone number/ do |name|
+Then /I should get (\w+)'s phone number/ do |name| #'
   @hello.getPhoneNumber(name).should_not == nil
 end

data/examples/swedish_calculator/Rakefile

@@ -0,0 +1,5 @@
+require 'cucumber/rake/task'
+
+Cucumber::Rake::Task.new do |t|
+  t.cucumber_opts = "--format pretty --language se"
+end

data/examples/swedish_calculator/features/steps/kalkulator_steps.rb

@@ -0,0 +1,22 @@
+require 'spec'
+$:.unshift(File.dirname(__FILE__) + '/../../lib')
+require 'kalkulator'
+
+Before do
+  @calc = Kalkulator.new
+end
+
+After do
+end
+
+Given /att jag har knappat in (\d+)/ do |n|
+  @calc.push n.to_i
+end
+
+When 'jag summerar' do
+  @result = @calc.add
+end
+
+Then /ska resultatet vara (\d+)/ do |result|
+  @result.should == result.to_i
+end

data/examples/swedish_calculator/features/summering.feature

@@ -0,0 +1,17 @@
+Egenskap: Summering
+  För att slippa att göra dumma fel
+  Som räknare
+  Vill jag kunna lägga samman
+
+  Scenario: två tal
+    Givet att jag har knappat in 5
+    Och att jag har knappat in 7
+    När jag summerar
+    Så ska resultatet vara 12
+  
+  Scenario: tre tal
+    Givet att jag har knappat in 5
+    Och att jag har knappat in 4
+    Och att jag har knappat in 3
+    När jag summerar
+    Så ska resultatet vara 12

data/examples/swedish_calculator/lib/kalkulator.rb

@@ -0,0 +1,11 @@
+class Kalkulator
+  def push(n)
+    @args ||= []
+    @args << n
+  end
+  
+  def add
+    #@args[0] + @args[1]
+    @args.inject(0){|n,sum| sum+=n}
+  end
+end

data/examples/tickets/Rakefile

@@ -1,4 +1,11 @@
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/rake/task'
 
-Cucumber::Rake::Task.new
+# Try these:
+#
+# rake features
+# rake features PROFILE=html
+Cucumber::Rake::Task.new do |t|
+  profile = ENV['PROFILE'] || 'default'
+  t.cucumber_opts = "--profile #{profile}"
+end

data/examples/tickets/cucumber.yml

@@ -0,0 +1,2 @@
+default: --format pretty
+html: --format html --out features.html

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

@@ -15,3 +15,18 @@ end
 Then "nested step should be executed" do
   @magic.should == 'mushroom'
 end
+
+Given /^the following table$/ do |table|
+  @table = table
+end
+
+Then /^I should be (\w+) in (\w+)$/ do |key, value|
+  hash = @table.hashes[0]
+  hash[key].should == value
+end
+
+Then /^I shoule see a multiline string like$/ do |s|
+  s.should == %{A string
+that spans
+several lines}
+end

data/examples/tickets/features/tickets.feature

@@ -8,4 +8,15 @@ Feature: Cucumber
     
   Scenario: Call step from step
     Given nested step is called
-    Then nested step should be executed
+    Then nested step should be executed
+    
+  Scenario: Reading a table
+    Given the following table
+      | born  | working |
+      | Oslo  | London  |
+    Then I should be working in London
+    And I should be born in Oslo
+    And I shoule see a multiline string like
+      "A string
+      that spans
+      several lines"

data/gem_tasks/treetop.rake

@@ -1,37 +1,49 @@
 class FeatureCompiler
-  def compile
+  def initialize
     require 'yaml'
     require 'erb'
-    tt = PLATFORM =~ /mswin|mingw/ ? 'tt.bat' : 'tt'
+    
+    @tt = PLATFORM =~ /mswin|mingw/ ? 'tt.bat' : 'tt'
 
-    template = ERB.new(IO.read(File.dirname(__FILE__) + '/../lib/cucumber/treetop_parser/feature.treetop.erb'))
-    langs = YAML.load_file(File.dirname(__FILE__) + '/../lib/cucumber/languages.yml')
-
-    langs.each do |lang, words|
-      grammar_file = File.dirname(__FILE__) + "/../lib/cucumber/treetop_parser/feature_#{lang}.treetop"
-      ruby_file    = File.dirname(__FILE__) + "/../lib/cucumber/treetop_parser/feature_#{lang}.rb"
-      grammar = template.result(binding)
-      File.open(grammar_file, "wb") do |io|
-        io.write(grammar)
-      end
-      sh "#{tt} #{grammar_file}"
-      FileUtils.rm(grammar_file)
-      
-      # Change code so it isn't part of RDoc
-      lines = IO.read(ruby_file).split("\n")
-      lines.each do |line|
-        if line =~ /\s*(def|class|module)/
-          line << " #:nodoc:"
-        end
+    @template = ERB.new(IO.read(File.dirname(__FILE__) + '/../lib/cucumber/treetop_parser/feature.treetop.erb'))
+    @langs = YAML.load_file(File.dirname(__FILE__) + '/../lib/cucumber/languages.yml')
+  end
+  
+  def compile_all
+    @langs.keys.each do |lang|
+      compile(lang)
+    end
+  end
+  
+  def compile(lang)
+    words = @langs['en'].merge(@langs[lang]) # Use English words if languages.yml is missing a word
+    grammar_file = File.dirname(__FILE__) + "/../lib/cucumber/treetop_parser/feature_#{lang}.treetop"
+    ruby_file    = File.dirname(__FILE__) + "/../lib/cucumber/treetop_parser/feature_#{lang}.rb"
+    grammar      = @template.result(binding)
+    File.open(grammar_file, "wb") do |io|
+      io.write(grammar)
+    end
+    sh "#{@tt} #{grammar_file}"
+    FileUtils.rm(grammar_file)
+    
+    # Change code so it isn't part of RDoc
+    lines = IO.read(ruby_file).split("\n")
+    lines.each do |line|
+      if line =~ /\s*(def|class|module)/
+        line << " #:nodoc:"
       end
-      File.open(ruby_file, 'wb'){|io| io.write(lines.join("\n"))}
     end
+    File.open(ruby_file, 'wb'){|io| io.write(lines.join("\n"))}
   end
 end
 
 namespace :treetop do
   desc 'Compile the grammar for all languages in languages.yml'
   task :compile do
-    FeatureCompiler.new.compile
+    FeatureCompiler.new.compile_all
+  end
+
+  task :compile_en do
+    FeatureCompiler.new.compile('en')
   end
 end