aslakhellesoy-cucumber 0.3.11.200907091518 → 0.3.90

data/History.txt

@@ -1,9 +1,10 @@
-== 0.3.12 (In Git)
+== 0.3.90 2009-07-22
 
 The Hot summer release
 
 This is a hot summer in Norway, and Cucumbers are growing in abundance. To celebrate this we give you
-a new release with some hot new features:
+a new release with lots of new features and bugfixes. This is also one of the last releases in the 0.3 series
+(hence the 0.3.90 number), so 0.4 (or maybe 1.0!) will be coming up soon. The highlights of this release are:
 
 === Egality
 
@@ -20,12 +21,12 @@ or default to English if no --language option was specified. A nice side effect
 have features in several languages side by side and run them in the same cucumber. (Not recommended unless 
 you want to take polyglot programming to an extreme level).
 
-=== Table diffing
+=== Table diffing (experimental)
 
 When you pass a table as an argument to your Then steps you often want to compare that table
 to some actual values. In previous releases you had to iterate over the table's values and manually
 compare each row using cell.should equal('foo') or assert_equal('foo', cell). If a discrepancy was found
-you'd get an error and then you were done.
+you'd get an error, but it was hard to see how the entire expected data set was different from the actual one.
 
 With this release you have a much more powerful way to compare expected tables with actual data. An
 Ast::Table object now has a new #diff!(table) method that you can invoke in your step definitions
@@ -33,11 +34,16 @@ that take table arguments. If the table you pass in is different from the expect
 plain text step), Cucumber will print the difference for each of the row or column and fail your step.
 
 The Table#diff! method expects an Array of Array, Array of Hash (similar to what you'd get from table#hashes)
-or simply another Ast::Table object.
+or simply another Ast::Table object. Here is a simple example:
 
-As an extra bonus we provide you with a new Webrat method that you can use to transform the data from
+  Then /^I should see the following cukes:$/ do |expected_cukes_table|
+    actual_table = ... # For example [['Latin', 'English'], ['Cucumis sativus', 'Cucumber'], ['Cucumis anguria', 'Burr Gherkin']]
+    expected_cukes_table.diff!(actual_table)
+  end
+
+As an extra bonus we provide Webrat users with a new #table_at(selector) method that you can use to transform 
 an HTML table into an Array of Array, so that you can easily compare the contents of your HTML table to
-expected data passed to a step:
+expected data passed to a step. Here is an example:
 
   Then /^I should see the following cukes:$/ do |expected_cukes_table|
     expected_cukes_table.diff!(table_at('#cuke_table').to_a)
@@ -49,7 +55,7 @@ database):
 
   # This requires that you use the column names in the header of the plain text expected table
   Then /^I should have the following cukes in the database:$/ do |expected_cukes_table|
-    expected_cukes_table.diff!(Cuke.find(:all).map(&attributes), :coldiff => false) # Don't care about extra columns
+    expected_cukes_table.diff!(Cuke.find(:all).map(&attributes))
   end
 
 === Environment variables
@@ -62,12 +68,13 @@ like you can with Rake). Example:
 You can now pick up ENV['FOO'] in ruby (for example in env.rb) and take actions according to the value,
 for example enabling your super hack that validates all HTTP responses for XHTML validity.
 
-This release also has several bugfixes related to --format and Before/Adter hooks.
+This release also has several bugfixes related to --format and Before/After hooks.
 
 === Bugfixes
+* Fix some misspellings which affect test fail for Korean example (#373 Dongju Kim)
 * Make it possible to write non-localized step definitions (#377 Aslak Hellesøy)
 * Table cells containing unicode are rendered incorrectly (#386 Stefan Kanev)
-* Before and After hooks run after everything is finished whn there are 2+ --format options (#371 Aslak Hellesøy)
+* Before and After hooks run after everything is finished when there are 2+ --format options (#371 Aslak Hellesøy)
 * When using --out and two --format the first is not delivered inline with execution of features (#361 Aslak Hellesøy)
 * Profile Formatter broken (#370 Aslak Hellesøy)
 * Default profile usage with --drb flag degrades gracefully with no server. (#367 Ben Mabey)
@@ -78,6 +85,7 @@ This release also has several bugfixes related to --format and Before/Adter hook
 * Fixed bug with rake task raising errors with feature files with spaces (#380 Joseph Wilk)
 
 === New Features
+* I should see should support regexes (#382 John Ferlito)
 * Access to scenario outline name from After hook scenario parameter (#342 Aslak Hellesøy)
 * Allow multiple --tags switches to be passed 
 * Load step definitions from vendored gems and plugins (#388 Mike Burns)
@@ -87,7 +95,7 @@ This release also has several bugfixes related to --format and Before/Adter hook
 * Display failing scenarios at the end of pretty format to make it easier for people to play them back (#360 Ryan Bigg)
 
 === Changed Features
-* With --tags, positive tags are &&'ed while negative tags are ||'ed (John Wilger)
+* When using --tags, positive tags are &&'ed while negative tags are ||'ed (John Wilger)
 * The data returned from Table#hashes and similar methods are frozen. Dup if you need to modify. (Aslak Hellesøy)
 * Visitor.visit_table_cell_value(value, col_width, status) is now visitor.visit_table_cell_value(value, status)
 

data/Manifest.txt

@@ -270,6 +270,7 @@ features/step_definitions/extra_steps.rb
 features/steps_formatter.feature
 features/support/env.rb
 features/table_diffing.feature
+features/unicode_table.feature
 features/usage.feature
 features/work_in_progress.feature
 gem_tasks/deployment.rake

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

@@ -4,11 +4,11 @@
   수학을 잘 못하는 사람으로써 
   두숫자의 합을 알고 싶다
 
-  시나리오: 두 숫자를 더하기
-    조건 계산기에 50을 입력했음
-    그리고 계산기에 70을 입력했음
-    만일 내가 add를 누르면
-    그러면 화면에 출력된 결과는 120이다
+  시나리오 개요: 두 숫자를 더하기
+    조건 계산기에 <입력1>을 입력했음
+    그리고 계산기에 <입력2>을 입력했음
+    만일 내가 <버튼>를 누르면
+    그러면 화면에 출력된 결과는 <결과>이다
 
   예:
     | 입력1 | 입력2 | 버튼 | 결과 |

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

@@ -15,7 +15,7 @@ Given /^계산기에 (.*)을 입력했음$/ do |n|
   @calc.push n.to_i
 end
 
-When /^내가 (.*)를 누루면$/ do |op|
+When /^내가 (.*)를 누르면$/ do |op|
   @result = @calc.send op
 end
 

data/examples/tickets/features/table_diffing.feature

@@ -0,0 +1,13 @@
+@intentional_failure
+Feature: Tables
+  Scenario: Extra row with table
+    Then the table should be different with table:
+      | a     | b    |
+      | one   | two  |
+      | three | four |
+
+  Scenario: Extra row and missing column with table
+    Then the table should be different with table:
+      | a     | e | b    |
+      | one   | Q | two  |
+      | three | R | four |

data/features/cucumber_cli_diff_disabled.feature

@@ -13,7 +13,8 @@ Feature: Cucumber command line
           Given failing expectation
             expected: "that",
                  got: "this" (using ==)
-            Diff:
+            
+             Diff:
             @@ -1,2 +1,2 @@
             -that
             +this

data/features/html_formatter/a.html

@@ -151,7 +151,8 @@ features/call_undefined_step_from_step_def.feature:4:in `Given a step definition
 ./features/step_definitions/sample_steps.rb:20:in `/^a step definition that calls an undefined step$/'
 features/call_undefined_step_from_step_def.feature:7:in `Given call step "a step definition that calls an undefined step"'</pre></li></ol></div></div><div class="feature"><h2><span class="val">Feature: Failing expectation</span></h2><p class="narrative"></p><div class="scenario"><h3><span class="keyword">Scenario:</span> <span class="val">Failing expectation</span></h3><ol><li class="step failed" id="features_failing_expectation_feature_4"><div><span class="keyword">Given</span> <span class="step val">failing expectation</span></div><pre class="failed">expected: "that",
      got: "this" (using ==)
-Diff:
+
+ Diff:
 @@ -1,2 +1,2 @@
 -that
 +this

data/features/table_diffing.feature

@@ -0,0 +1,45 @@
+Feature: Table diffing
+  In order to more easily compare data in tables
+  step definition writers should be able to diff
+  a table with expected data and see the diff inline
+  
+  Scenario: Extra row
+    Given a standard Cucumber project directory structure
+    And a file named "features/tables.feature" with:
+      """
+      Feature: Tables
+        Scenario: Extra row
+          Then the table should be:
+            | x | y |
+            | a | b |
+      """
+    And a file named "features/step_definitions/table_steps.rb" with:
+      """
+      Then /the table should be:/ do |expected|
+        expected.diff!(table(%{
+          | x | y | 
+          | a | c |
+        }))
+      end
+      """
+    When I run cucumber -i features/tables.feature
+    Then it should fail with
+      """
+      Feature: Tables
+      
+        Scenario: Extra row         # features/tables.feature:2
+          Then the table should be: # features/step_definitions/table_steps.rb:1
+            | x | y |
+            | a | b |
+            | a | c |
+            Tables were not identical (RuntimeError)
+            ./features/step_definitions/table_steps.rb:2:in `/the table should be:/'
+            features/tables.feature:3:in `Then the table should be:'
+      
+      Failing Scenarios:
+      cucumber features/tables.feature:2 # Scenario: Extra row
+
+      1 scenario (1 failed)
+      1 step (1 failed)
+
+      """

data/features/unicode_table.feature

@@ -0,0 +1,35 @@
+Feature: Unicode in tables
+  In order to please the whole world,
+  unicode characters in tables should be
+  properly aligned
+  
+  Scenario: All sorts of weird stuff
+    Given a standard Cucumber project directory structure
+    And a file named "features/unicode.feature" with:
+      """
+      Feature: Featuring unicode
+
+        Scenario: So what, whatever
+          Given passing
+            | Brüno | abc |
+            | Bruno | æøå |
+      """
+    And a file named "features/env.rb" with:
+      """
+      $KCODE='u'
+      """
+    When I run cucumber -q --dry-run features/unicode.feature
+    Then it should pass with
+      """
+      Feature: Featuring unicode
+
+        Scenario: So what, whatever
+          Given passing
+            | Brüno | abc |
+            | Bruno | æøå |
+
+      1 scenario (1 undefined)
+      1 step (1 undefined)
+
+      """
+    

data/lib/cucumber/version.rb

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

data/lib/cucumber/webrat/table_locator.rb

@@ -0,0 +1,66 @@
+module Webrat
+  class Table < Element
+    def self.xpath_search
+      ".//table"
+    end
+
+    # Converts this Table element into a 2-dimensional array of String where each cell
+    # represents the inner_html of the <td> and <th> elements. The number of columns is
+    # determined by the number of cells in the first row.
+    def to_a
+      col_count = nil
+      Webrat::XML.css_search(@element, 'tr').map do |row|
+        cols = Webrat::XML.css_search(row, 'th,td')
+        col_count ||= cols.length
+        cols[0...col_count].map do |col|
+          col.inner_html
+        end
+      end
+    end
+  end
+  
+  module Locators
+    class TableLocator < Locator
+      def locate
+        Table.load(@session, table_element)
+      end
+
+      def table_element
+        table_elements.detect do |table_element|
+          matches_id?(table_element) ||
+          matches_css_selector?(table_element)
+        end
+      end
+
+      def matches_id?(table_element)
+        Webrat::XML.attribute(table_element, "id") == @value.to_s
+      end
+
+      def matches_css_selector?(table_element)
+        Webrat::XML.css_at(@dom, @value)
+      end
+
+      def table_elements
+        Webrat::XML.xpath_search(@dom, *Table.xpath_search)
+      end
+
+      def error_message
+        "Could not find table matching '#{@value}'"
+      end
+    end
+
+    # Returns a Table element located by +id_or_selector+, which can
+    # be a DOM id or a CSS selector.
+    def table_at(id_or_selector)
+      TableLocator.new(@session, dom, id_or_selector).locate!
+    end
+  end
+  
+  module Methods
+    delegate_to_session :table_at
+  end
+  
+  class Session
+    def_delegators :current_scope, :table_at
+  end
+end

data/rails_generators/cucumber/templates/env.rb

@@ -15,6 +15,7 @@ Cucumber::Rails.use_transactional_fixtures
 Cucumber::Rails.bypass_rescue
 
 require 'webrat'
+require 'cucumber/webrat/table_locator' # Lets you do table.diff!(table_at('#my_table').to_a)
 
 Webrat.configure do |config|
   config.mode = :rails
@@ -23,5 +24,4 @@ end
 
 require 'cucumber/rails/rspec'
 require 'webrat/core/matchers'
-require 'cucumber/webrat/table_locator' # Lets you do table.diff!(table_at('#my_table').to_a)
 <% end -%>

data/rails_generators/cucumber/templates/webrat_steps.rb

@@ -98,6 +98,15 @@ Then /^I should see "([^\"]*)"$/ do |text|
 <% end -%>
 end
 
+Then /^I should see \/([^\/]*)\/$/ do |regexp|
+  regexp = Regexp.new(regexp)
+<% if framework == :rspec -%>
+  response.should contain(regexp)
+<% else -%>
+  assert_contain regexp
+<% end -%>
+end
+
 Then /^I should not see "([^\"]*)"$/ do |text|
 <% if framework == :rspec -%>
   response.should_not contain(text)
@@ -106,6 +115,14 @@ Then /^I should not see "([^\"]*)"$/ do |text|
 <% end -%>
 end
 
+Then /^I should not see \/([^\/]*)\/$/ do |regexp|
+<% if framework == :rspec -%>
+  response.should_not contain(text)
+<% else -%>
+  assert_not_contain text
+<% end -%>
+end
+
 Then /^the "([^\"]*)" field should contain "([^\"]*)"$/ do |field, value|
 <% if framework == :rspec -%>
   field_labeled(field).value.should =~ /#{value}/

data/spec/cucumber/ast/table_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require File.dirname(__FILE__) + '/../../spec_helper'
 require 'cucumber/ast/table'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aslakhellesoy-cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.3.11.200907091518
+  version: 0.3.90
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-09 00:00:00 -07:00
+date: 2009-07-22 00:00:00 -07:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -306,6 +306,7 @@ files:
 - examples/tickets/features/step_definitons/248_steps.rb
 - examples/tickets/features/step_definitons/scenario_outline_steps.rb
 - examples/tickets/features/step_definitons/tickets_steps.rb
+- examples/tickets/features/table_diffing.feature
 - examples/tickets/features/tickets.feature
 - examples/watir/README.textile
 - examples/watir/Rakefile
@@ -335,6 +336,8 @@ files:
 - features/step_definitions/extra_steps.rb
 - features/steps_formatter.feature
 - features/support/env.rb
+- features/table_diffing.feature
+- features/unicode_table.feature
 - features/usage.feature
 - features/work_in_progress.feature
 - gem_tasks/deployment.rake
@@ -416,6 +419,7 @@ files:
 - lib/cucumber/step_match.rb
 - lib/cucumber/step_mother.rb
 - lib/cucumber/version.rb
+- lib/cucumber/webrat/table_locator.rb
 - lib/cucumber/world.rb
 - rails_generators/cucumber/USAGE
 - rails_generators/cucumber/cucumber_generator.rb
@@ -475,7 +479,7 @@ files:
 - spec/cucumber/world/pending_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://cukes.info
 post_install_message: 
 rdoc_options: 
@@ -500,7 +504,7 @@ requirements: []
 rubyforge_project: rspec
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Executable Feature scenarios
 test_files: []