cucumber 1.3.6 → 1.3.7

data/History.md

@@ -1,6 +1,26 @@
+## [1.3.7](https://github.com/cucumber/cucumber/compare/v1.3.6...v1.3.7)
+
+* Fixed incorrect html formatter behaviour when background step fails
+  ([520](https://github.com/cucumber/cucumber/issues/520),
+   [521](https://github.com/cucumber/cucumber/issues/521) @mlex)
+
+* Fixed problem with printing badly formatted backtrace for failed background
+  ([522](https://github.com/cucumber/cucumber/issues/522),
+   [523](https://github.com/cucumber/cucumber/issues/523) @mlex)
+
+* required Gherkin version bumped to 2.12.1
+
+* All mutating methods of AST::Table deprecated
+  ([505](https://github.com/cucumber/cucumber/issues/505),
+   [525](https://github.com/cucumber/cucumber/issues/525) @adbatista)
+
+* AST::Table#map_headers doesn't use #map_headers! anymore
+  ([505](https://github.com/cucumber/cucumber/issues/528) @adbatista)
+
 ## [1.3.6](https://github.com/cucumber/cucumber/compare/v1.3.5...v1.3.6)
 
-* Html formatter fixed to not mark passes scenarios with tables as pending ([493](https://github.com/cucumber/cucumber/issues/493) Oleg Sukhodolsky)
+* Html formatter fixed to not mark passes scenarios with tables as pending
+  ([493](https://github.com/cucumber/cucumber/issues/493) Oleg Sukhodolsky)
 
 ## [1.3.5](https://github.com/cucumber/cucumber/compare/v1.3.4...v1.3.5)
 

data/cucumber.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'builder', '>= 2.1.2'
   s.add_dependency 'diff-lcs', '>= 1.1.3'
-  s.add_dependency 'gherkin', '~> 2.12.0'
+  s.add_dependency 'gherkin', '~> 2.12.1'
   s.add_dependency 'multi_json', '~> 1.7.5'
   s.add_dependency 'multi_test', '>= 0.0.2'
 

data/features/docs/gherkin/language_help.feature

@@ -0,0 +1,37 @@
+@needs-many-fonts
+Feature: Language help
+
+  It's possible to ask cucumber which keywords are used for any
+  particular language by running:
+
+  `cucumber --i18n <language code> help`
+
+  This will print a table showing all the different words we use for
+  that language, to allow you to easily write features in any language
+  you choose.
+
+  Scenario: Get help for Portuguese language
+    When I run `cucumber --i18n pt help`
+    Then it should pass with:
+      """
+            | feature          | "Funcionalidade", "Característica", "Caracteristica"                                         |
+            | background       | "Contexto", "Cenário de Fundo", "Cenario de Fundo", "Fundo"                                  |
+            | scenario         | "Cenário", "Cenario"                                                                         |
+            | scenario_outline | "Esquema do Cenário", "Esquema do Cenario", "Delineação do Cenário", "Delineacao do Cenario" |
+            | examples         | "Exemplos", "Cenários", "Cenarios"                                                           |
+            | given            | "* ", "Dado ", "Dada ", "Dados ", "Dadas "                                                   |
+            | when             | "* ", "Quando "                                                                              |
+            | then             | "* ", "Então ", "Entao "                                                                     |
+            | and              | "* ", "E "                                                                                   |
+            | but              | "* ", "Mas "                                                                                 |
+            | given (code)     | "Dado", "Dada", "Dados", "Dadas"                                                             |
+            | when (code)      | "Quando"                                                                                     |
+            | then (code)      | "Então", "Entao"                                                                             |
+            | and (code)       | "E"                                                                                          |
+            | but (code)       | "Mas"                                                                                        |
+
+      """
+
+  Scenario: List languages
+    When I run `cucumber --i18n help`
+    Then cucumber lists all the supported languages

data/features/html_formatter.feature

@@ -27,8 +27,22 @@ Feature: HTML output formatter
             | two     |
             | three   |
       """
+    And a file named "features/failing_background_step.feature" with:
+      """
+      Feature: Feature with failing background step
+
+        Background:
+          Given this fails
+
+        Scenario:
+          When I do something
+          Then I should see something
+      """
     And a file named "features/step_definitions/steps.rb" with:
       """
+      Given /^this fails$/ do
+        fail 'This step should fail'
+      end
       Given /^this hasn't been implemented yet$/ do
         pending
       end
@@ -61,10 +75,20 @@ Feature: HTML output formatter
     """
       default: -r features
     """
-    When I run `cucumber --profile default --format html`
+    When I run `cucumber features/scenario_outline_with_undefined_steps.feature --profile default --format html`
     Then it should pass
     And the output should not contain:
     """
     Using the default profile...
     """
 
+  Scenario: a feature with a failing background step
+    When I run `cucumber features/failing_background_step.feature --format html`
+    Then the output should not contain:
+    """
+    makeRed('scenario_0')
+    """
+    And the output should contain:
+    """
+    makeRed('background_0')
+    """

data/features/lib/step_definitions/language_steps.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+
+Then(/^cucumber lists all the supported languages$/) do
+  all_output.should include("Arabic")
+  all_output.should include("български")
+  all_output.should include("Pirate")
+  all_output.should include("English")
+  all_output.should include("日本語")
+end

data/legacy_features/step_definitions/cucumber_steps.rb

@@ -141,6 +141,10 @@ Then /^STDERR should be empty$/ do
   last_stderr.should == ""
 end
 
+Then /^STDERR should have warning message$/ do
+  last_stderr.should include("[warning]")
+end
+
 Then /^"([^"]*)" should exist$/ do |file|
   File.exists?(file).should be_true
   FileUtils.rm(file)

data/legacy_features/table_mapping.feature

@@ -18,7 +18,7 @@ Feature: Table mapping
       }
       """
     When I run cucumber features/f.feature
-    Then STDERR should be empty
+    Then STDERR should have warning message
     And it should pass with
       """
       Feature: F
@@ -30,5 +30,5 @@ Feature: Table mapping
 
       1 scenario (1 passed)
       1 step (1 passed)
-      
+
       """

data/legacy_features/wire_protocol_table_diffing.feature

@@ -29,7 +29,7 @@ Feature: Wire protocol table diffing
       | ["diff_failed"]                                      | ["fail",{"message":"Not same", "exception":"DifferentException", "backtrace":["a.cs:12","b.cs:34"]}] |
       | ["end_scenario"]                                     | ["success"]                                                                                          |
     When I run cucumber -f progress --backtrace
-    Then STDERR should be empty
+    Then STDERR should have warning message
     And it should fail with
       """
       F
@@ -109,7 +109,7 @@ Feature: Wire protocol table diffing
 
       Tables were not identical (Cucumber::Ast::Table::Different)
       features/wired.feature:3:in `Given we're all wired'
-      
+
       Failing Scenarios:
       cucumber features/wired.feature:2 # Scenario: Wired
 

data/lib/cucumber/ast/table.rb

@@ -238,16 +238,15 @@ module Cucumber
       #   # => ['phone number', 'ADDRESS']
       #
       def map_headers!(mappings={}, &block)
+        Kernel.warn "[warning] map_headers! will be deprecated, please use map_headers instead."
         clear_cache!
         @header_mappings = mappings
         @header_conversion_proc = block
       end
 
       # Returns a new Table where the headers are redefined. See #map_headers!
-      def map_headers(mappings={})
-        table = self.dup
-        table.map_headers!(mappings)
-        table
+      def map_headers(mappings={}, &block)
+        self.class.new raw.dup, @conversion_procs.dup, mappings, block
       end
 
       # Change how #hashes converts column values. The +column_name+ argument identifies the column
@@ -263,6 +262,7 @@ module Cucumber
       #   end
       #
       def map_column!(column_name, strict=true, &conversion_proc)
+        Kernel.warn "[warning] map_column! will be deprecated"
         @conversion_procs[column_name.to_s] = { :strict => strict, :proc => conversion_proc }
         self
       end
@@ -304,6 +304,7 @@ module Cucumber
       # a Table argument, if you want to compare that table to some actual values.
       #
       def diff!(other_table, options={})
+        Kernel.warn "[warning] diff! will be deprecated"
         options = {
           :missing_row   => true,
           :surplus_row   => true,

data/lib/cucumber/formatter/html.rb

@@ -268,6 +268,7 @@ module Cucumber
       end
 
       def exception(exception, status)
+        return if @hide_this_step
         build_exception_detail(exception)
       end
 
@@ -417,7 +418,8 @@ module Cucumber
         @builder.script do
           @builder.text!("makeRed('cucumber-header');") unless @header_red
           @header_red = true
-          @builder.text!("makeRed('scenario_#{@scenario_number}');") unless @scenario_red
+          scenario_or_background = @in_background ? "background" : "scenario"
+          @builder.text!("makeRed('#{scenario_or_background}_#{@scenario_number}');") unless @scenario_red
           @scenario_red = true
         end
       end
@@ -425,7 +427,8 @@ module Cucumber
       def set_scenario_color_pending
         @builder.script do
           @builder.text!("makeYellow('cucumber-header');") unless @header_red
-          @builder.text!("makeYellow('scenario_#{@scenario_number}');") unless @scenario_red
+          scenario_or_background = @in_background ? "background" : "scenario"
+          @builder.text!("makeYellow('#{scenario_or_background}_#{@scenario_number}');") unless @scenario_red
         end
       end
 

data/lib/cucumber/platform.rb

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

data/spec/cucumber/ast/table_spec.rb

@@ -54,7 +54,7 @@ module Cucumber
           @table.map_column!('one') { |v| v.to_i }
           @table.hashes.first['one'].should == 4444
         end
-        
+
         it "applies the block once to each value" do
           headers = ['header']
           rows = ['value']
@@ -158,75 +158,84 @@ module Cucumber
         end
       end
 
-      describe '#map_headers' do
+      describe '#map_headers!' do
+        let(:table) do
+          Table.new([
+          %w{HELLO WORLD},
+          %w{4444 55555}
+          ])
+        end
+
         it "renames the columns to the specified values in the provided hash" do
-          table2 = @table.map_headers('one' => :three)
-          table2.hashes.first[:three].should == '4444'
+          @table.map_headers!('one' => :three)
+          @table.hashes.first[:three].should == '4444'
         end
 
         it "allows renaming columns using regexp" do
-          table2 = @table.map_headers(/one|uno/ => :three)
-          table2.hashes.first[:three].should == '4444'
+          @table.map_headers!(/one|uno/ => :three)
+          @table.hashes.first[:three].should == '4444'
         end
 
         it "copies column mappings" do
           @table.map_column!('one') { |v| v.to_i }
-          table2 = @table.map_headers('one' => 'three')
-          table2.hashes.first['three'].should == 4444
+          @table.map_headers!('one' => 'three')
+          @table.hashes.first['three'].should == 4444
         end
 
         it "takes a block and operates on all the headers with it" do
-          table = Table.new([
-          ['HELLO', 'WORLD'],
-          %w{4444 55555}
-          ])
-
           table.map_headers! do |header|
             header.downcase
           end
-
           table.hashes.first.keys.should =~ %w[hello world]
         end
 
         it "treats the mappings in the provided hash as overrides when used with a block" do
-          table = Table.new([
-          ['HELLO', 'WORLD'],
-          %w{4444 55555}
-          ])
-
           table.map_headers!('WORLD' => 'foo') do |header|
             header.downcase
           end
 
           table.hashes.first.keys.should =~ %w[hello foo]
         end
+      end
 
-        it "should allow mapping of headers before table.hashes has been accessed" do
-          table = Table.new([
-          ['HELLO', 'WORLD'],
+      describe '#map_headers' do
+        let(:table) do
+           Table.new([
+          %w{HELLO WORLD},
           %w{4444 55555}
           ])
+        end
 
-          table.map_headers! do |header|
-            header.downcase
-          end
+        it "renames the columns to the specified values in the provided hash" do
+          table2 = @table.map_headers('one' => :three)
+          table2.hashes.first[:three].should == '4444'
+        end
 
-          table.hashes.first.keys.should =~ %w[hello world]
+        it "allows renaming columns using regexp" do
+          table2 = @table.map_headers(/one|uno/ => :three)
+          table2.hashes.first[:three].should == '4444'
         end
 
-        it "should allow mapping of headers after table.hashes has been accessed" do
-          table = Table.new([
-          ['HELLO', 'WORLD'],
-          %w{4444 55555}
-          ])
+        it "copies column mappings" do
+          @table.map_column!('one') { |v| v.to_i }
+          table2 = @table.map_headers('one' => 'three')
+          table2.hashes.first['three'].should == 4444
+        end
 
-          dev_null = table.hashes.size
+        it "takes a block and operates on all the headers with it" do
+          table2 = table.map_headers do |header|
+            header.downcase
+          end
 
-          table.map_headers! do |header|
+          table2.hashes.first.keys.should =~ %w[hello world]
+        end
+
+        it "treats the mappings in the provided hash as overrides when used with a block" do
+          table2 = table.map_headers('WORLD' => 'foo') do |header|
             header.downcase
           end
 
-          table.hashes.first.keys.should =~ %w[hello world]
+          table2.hashes.first.keys.should =~ %w[hello foo]
         end
       end
 
@@ -289,7 +298,6 @@ module Cucumber
             table.arguments_replaced({'<book>' => nil, '<qty>' => '5'})
           }.should_not raise_error
         end
-
       end
 
       describe "diff!" do

data/spec/cucumber/formatter/html_spec.rb

@@ -211,7 +211,7 @@ module Cucumber
           it { @doc.should have_css_node('.feature .scenario .step.failed .message', /StandardError/) }
         end
 
-        describe "with a step that fails in the backgound" do
+        describe "with a step that fails in the background" do
           define_steps do
             Given(/boo/) { raise 'eek' }
           end
@@ -225,8 +225,12 @@ module Cucumber
             FEATURE
 
           it { @doc.should have_css_node('.feature .background .step.failed', /eek/) }
+          it { @out.string.should_not include('makeRed(\'scenario_0\')') }
+          it { @out.string.should include('makeRed(\'background_0\')') }
           it { @doc.should_not have_css_node('.feature .scenario .step.failed', //) }
           it { @doc.should have_css_node('.feature .scenario .step.undefined', /yay/) }
+          it { @doc.should have_css_node('.feature .background .backtrace', //) }
+          it { @doc.should_not have_css_node('.feature .scenario .backtrace', //) }
         end
 
         describe "with a step that embeds a snapshot" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.3.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.12.1
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -625,6 +625,7 @@ files:
 - features/bootstrap.feature
 - features/custom_formatter.feature
 - features/doc_strings.feature
+- features/docs/gherkin/language_help.feature
 - features/drb_server_integration.feature
 - features/execute_with_tag_filter.feature
 - features/formatter_callbacks.feature
@@ -632,6 +633,7 @@ files:
 - features/html_formatter.feature
 - features/iso-8859-1.feature
 - features/json_formatter.feature
+- features/lib/step_definitions/language_steps.rb
 - features/load_path.feature
 - features/nested_steps.feature
 - features/nested_steps_i18n.feature
@@ -758,7 +760,6 @@ files:
 - legacy_features/expand.feature
 - legacy_features/junit_formatter.feature
 - legacy_features/language_from_header.feature
-- legacy_features/language_help.feature
 - legacy_features/listener_debugger_formatter.feature
 - legacy_features/multiline_names.feature
 - legacy_features/post_configuration_hook.feature
@@ -963,7 +964,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -233265350743836880
+      hash: 2687724431755954047
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -972,12 +973,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -233265350743836880
+      hash: 2687724431755954047
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: cucumber-1.3.6
+summary: cucumber-1.3.7
 test_files: []
 has_rdoc: 

data/legacy_features/language_help.feature

@@ -1,87 +0,0 @@
-@needs-many-fonts
-Feature: Language help
-  In order to figure out the keywords to use for a language
-  I want to be able to get help on the language from the CLI
-  
-  Scenario: Get help for Portuguese language
-    When I run cucumber --i18n pt help
-    Then it should pass with
-      """
-            | feature          | "Funcionalidade", "Característica", "Caracteristica"                                         |
-            | background       | "Contexto", "Cenário de Fundo", "Cenario de Fundo", "Fundo"                                  |
-            | scenario         | "Cenário", "Cenario"                                                                         |
-            | scenario_outline | "Esquema do Cenário", "Esquema do Cenario", "Delineação do Cenário", "Delineacao do Cenario" |
-            | examples         | "Exemplos", "Cenários", "Cenarios"                                                           |
-            | given            | "* ", "Dado ", "Dada ", "Dados ", "Dadas "                                                   |
-            | when             | "* ", "Quando "                                                                              |
-            | then             | "* ", "Então ", "Entao "                                                                     |
-            | and              | "* ", "E "                                                                                   |
-            | but              | "* ", "Mas "                                                                                 |
-            | given (code)     | "Dado", "Dada", "Dados", "Dadas"                                                             |
-            | when (code)      | "Quando"                                                                                     |
-            | then (code)      | "Então", "Entao"                                                                             |
-            | and (code)       | "E"                                                                                          |
-            | but (code)       | "Mas"                                                                                        |
-
-      """
-
-  Scenario: List languages
-    When I run cucumber --i18n help
-    Then STDERR should be empty
-    Then it should pass with
-      """
-            | ar        | Arabic              | العربية           |
-            | bg        | Bulgarian           | български         |
-            | bm        | Malay               | Bahasa Melayu     |
-            | ca        | Catalan             | català            |
-            | cs        | Czech               | Česky             |
-            | cy-GB     | Welsh               | Cymraeg           |
-            | da        | Danish              | dansk             |
-            | de        | German              | Deutsch           |
-            | el        | Greek               | Ελληνικά          |
-            | en        | English             | English           |
-            | en-Scouse | Scouse              | Scouse            |
-            | en-au     | Australian          | Australian        |
-            | en-lol    | LOLCAT              | LOLCAT            |
-            | en-old    | Old English         | Englisc           |
-            | en-pirate | Pirate              | Pirate            |
-            | en-tx     | Texan               | Texan             |
-            | eo        | Esperanto           | Esperanto         |
-            | es        | Spanish             | español           |
-            | et        | Estonian            | eesti keel        |
-            | fa        | Persian             | فارسی             |
-            | fi        | Finnish             | suomi             |
-            | fr        | French              | français          |
-            | gl        | Galician            | galego            |
-            | he        | Hebrew              | עברית             |
-            | hi        | Hindi               | हिंदी             |
-            | hr        | Croatian            | hrvatski          |
-            | hu        | Hungarian           | magyar            |
-            | id        | Indonesian          | Bahasa Indonesia  |
-            | is        | Icelandic           | Íslenska          |
-            | it        | Italian             | italiano          |
-            | ja        | Japanese            | 日本語               |
-            | ko        | Korean              | 한국어               |
-            | lt        | Lithuanian          | lietuvių kalba    |
-            | lu        | Luxemburgish        | Lëtzebuergesch    |
-            | lv        | Latvian             | latviešu          |
-            | nl        | Dutch               | Nederlands        |
-            | no        | Norwegian           | norsk             |
-            | pl        | Polish              | polski            |
-            | pt        | Portuguese          | português         |
-            | ro        | Romanian            | română            |
-            | ru        | Russian             | русский           |
-            | sk        | Slovak              | Slovensky         |
-            | sr-Cyrl   | Serbian             | Српски            |
-            | sr-Latn   | Serbian (Latin)     | Srpski (Latinica) |
-            | sv        | Swedish             | Svenska           |
-            | tl        | Telugu              | తెలుగు            |
-            | tr        | Turkish             | Türkçe            |
-            | tt        | Tatar               | Татарча           |
-            | uk        | Ukrainian           | Українська        |
-            | uz        | Uzbek               | Узбекча           |
-            | vi        | Vietnamese          | Tiếng Việt        |
-            | zh-CN     | Chinese simplified  | 简体中文              |
-            | zh-TW     | Chinese traditional | 繁體中文              |
-
-      """