cucumber-rails 0.3.0 → 0.3.1

data/lib/cucumber/rails/capybara_javascript_emulation.rb

@@ -57,14 +57,14 @@ class Capybara::Driver::RackTest::Node
   include Cucumber::Rails::CapybaraJavascriptEmulation
 end
 
-Before('~@no-txn', '~@selenium', '~@culerity', '~@celerity', '~@javascript') do
+Before('~@no-js-emulation') do
   # Enable javascript emulation
   Capybara::Driver::RackTest::Node.class_eval do
     alias_method :click, :click_with_javascript_emulation
   end
 end
 
-Before('@no-txn,@selenium,@culerity,@celerity,@javascript') do
+Before('@no-js-emulation') do
   # Disable javascript emulation
   Capybara::Driver::RackTest::Node.class_eval do
     alias_method :click, :click_without_javascript_emulation

data/lib/cucumber/rails/rspec.rb

@@ -1,13 +1,11 @@
 require 'cucumber/rails/world'
 
 begin
-  require 'rspec/expectations'
-  require 'rspec/rails'
+  require 'rspec/rails/matchers'
 
   [Cucumber::Rails::World, ActionController::Integration::Session].each do |klass|
     klass.class_eval do
       include Rspec::Matchers
-      include Rspec::Rails::Matchers
     end
   end
 rescue LoadError => try_rspec_1
@@ -17,7 +15,7 @@ rescue LoadError => try_rspec_1
   [Cucumber::Rails::World, ActionController::Integration::Session].each do |klass|
     klass.class_eval do
       include Spec::Matchers
-      include Spec::Rails::Matchers
+      include Spec::Rails::Matchers if defined?(Spec::Rails::Matchers)
     end
   end
-end
+end

data/lib/cucumber/rails/test_unit.rb

@@ -1,9 +1,7 @@
+# This is fishy. Try to get rid of it....
 begin
   require 'test/unit/testresult'
-rescue LoadError => e
-  e.message << "\nYou must gem install test-unit. For more info see https://rspec.lighthouseapp.com/projects/16211/tickets/292"
-  e.message << "\nAlso make sure you have rack 1.0.0 or higher."
-  raise e
+  # So that Test::Unit doesn't launch at the end - makes it think it has already been run.
+  Test::Unit.run = true if Test::Unit.respond_to?(:run=)
+rescue LoadError => ignore
 end
-# So that Test::Unit doesn't launch at the end - makes it think it has already been run.
-Test::Unit.run = true if Test::Unit.respond_to?(:run=)

data/lib/cucumber/rails/world.rb

@@ -37,7 +37,7 @@ module Cucumber #:nodoc:
     class World < ActionController::IntegrationTest
       include ActiveSupport::Testing::SetupAndTeardown if ActiveSupport::Testing.const_defined?("SetupAndTeardown")
       def initialize #:nodoc:
-        @_result = Test::Unit::TestResult.new
+        @_result = Test::Unit::TestResult.new if defined?(Test::Unit::TestResult)
       end
     end
   end

data/lib/cucumber/web/tableish.rb

@@ -3,7 +3,7 @@ require 'nokogiri'
 module Cucumber
   module Web
     module Tableish
-      # This method returns an Array of Array of String, using CSS3 selectors. 
+      # This method returns an Array of Array of String, using CSS3 selectors.
       # This is particularly handy when using Cucumber's Table#diff! method.
       #
       # The +row_selector+ argument must be a String, and picks out all the rows
@@ -51,27 +51,68 @@ module Cucumber
 
       def _tableish(html, row_selector, column_selectors) #:nodoc
         doc = Nokogiri::HTML(html)
-        column_count = nil
-        doc.search(row_selector).map do |row|
+        spans = nil
+        max_cols = 0
+
+        # Parse the table.
+        rows = doc.search(row_selector).map do |row|
           cells = case(column_selectors)
           when String
             row.search(column_selectors)
           when Proc
             column_selectors.call(row)
           end
-          column_count ||= cells.length
-          (0...column_count).map do |n|
-            cell = cells[n]
-            case(cell)
+
+          # TODO: max_cols should be sum of colspans
+          max_cols = [max_cols, cells.length].max
+
+          spans ||= Array.new(max_cols, 1)
+
+          cell_index = 0
+
+          cells = (0...spans.length).inject([]) do |array, n|
+            span = spans[n]
+
+            cell = if span > 1
+              row_span, col_span = 1, 1
+              nil
+            else
+              cell = cells[cell_index]
+
+              row_span, col_span = _parse_spans(cell)
+
+              if col_span > 1
+                ((n + 1)...(n + col_span)).each do |m|
+                  spans[m] = row_span + 1
+                end
+              end
+
+              cell_index +=1
+              cell
+            end
+
+            spans[n] = row_span > 1 ? row_span : ([span - 1, 1].max)
+
+            array << case cell
               when String then cell.strip
               when nil then ''
               else cell.text.strip
             end
+
+            array
           end
+
+          cells
         end
       end
-    end    
+
+      def _parse_spans(cell)
+        cell.is_a?(Nokogiri::XML::Node) ?
+          [cell.attributes['rowspan'].to_s.to_i || 1, cell.attributes['colspan'].to_s.to_i || 1] :
+          [1, 1]
+      end
+    end
   end
 end
 
-World(Cucumber::Web::Tableish)
+World(Cucumber::Web::Tableish)

data/lib/generators/cucumber/skeleton/skeleton_base.rb

@@ -32,9 +32,9 @@ module Cucumber
         unless rails2
           puts "Update Rails 3 Gemfile for cucumber"
           gsub_file 'Gemfile', /('|")gem/, "\1\ngem"
-          add_gem('database_cleaner', '>=0.5.0') unless has_plugin? 'database_cleaner'
+          add_gem('database_cleaner', '>=0.5.2') unless has_plugin? 'database_cleaner'
           if driver == :capybara
-            add_gem('capybara', '>=0.3.0')
+            add_gem('capybara', '>=0.3.7')
           else
             add_gem('webrat', '>=0.7.0') unless has_plugin? 'webrat'
           end
@@ -107,8 +107,8 @@ module Cucumber
 
       def create_database(m = self, rails2 = false)
         unless File.read('config/database.yml').include? 'cucumber:'
-          m.gsub_file 'config/database.yml', /^test:.*\n/, "test: &TEST\n"
-          m.gsub_file 'config/database.yml', /\z/, "\ncucumber:\n  <<: *TEST"
+          m.gsub_file 'config/database.yml', /^test:.*\n/, "test: &test\n"
+          m.gsub_file 'config/database.yml', /\z/, "\ncucumber:\n  <<: *test"
           
           # Since gsub_file doesn't ask the user, just inform user that the file was overwritten.
           puts "       force  config/database.yml"

data/rvm.yml

@@ -7,7 +7,7 @@ rails_gems:
   2.3.5:
     - rails -v 2.3.5
   3.0.0.beta:
-    - i18n -v 0.3.0
+    - i18n -v 0.3.5
     - tzinfo -v 0.3.16
     - memcache-client -v 1.7.5
     - rack-mount -v 0.4.0
@@ -15,7 +15,7 @@ rails_gems:
     - text-format -v 1.0.0
     - erubis -v 2.6.5
     - mail -v 2.1.2
-    - thor -v 0.13
+    - thor -v 0.13.4
     - bundler -v 0.9.7
     - builder -v 2.1.2
     - rails --pre

data/spec/cucumber/web/tableish_spec.rb

@@ -9,7 +9,7 @@ module Cucumber
   module Web
     describe Tableish do
       include Tableish
-      
+
       unless RUBY_PLATFORM =~ /java/
         it "should convert a table" do
           html = <<-HTML
@@ -58,9 +58,9 @@ module Cucumber
           HTML
 
           _tableish(html, 'table#tools tr', 'td,th').should == [
-            %w{tool dude},
-            %w{webrat bryan},
-            %w{cucumber aslak}
+            ['tool',     'dude',],
+            ['webrat',   'bryan'],
+            ['cucumber', 'aslak']
           ]
         end
 
@@ -88,6 +88,36 @@ module Cucumber
           ]
         end
 
+        it "should handle colspan and rowspan" do
+          html = <<-HTML
+            <table id="tools">
+              <tr>
+                <td rowspan="4">a</td>
+                <td>b</td>
+                <td>c</td>
+                <td>d</td>
+              </tr>
+              <tr>
+                <td colspan="3">e</td>
+              </tr>
+              <tr>
+                <td rowspan="2" colspan="2">f</td>
+                <td>g</td>
+              </tr>
+              <tr>
+                <td>h</td>
+              </tr>
+            </table>
+          HTML
+
+          _tableish(html, 'table#tools tr', 'td,th').should == [
+            ['a', 'b', 'c', 'd'],
+            ['',  'e', '',  '' ],
+            ['',  'f', '',  'g' ],
+            ['',  '',  '',  'h' ],
+           ]
+        end
+
         it "should convert a dl" do
           html = <<-HTML
             <dl id="tools">
@@ -144,7 +174,7 @@ module Cucumber
             </form>
           HTML
 
-          selectors = lambda do |form| 
+          selectors = lambda do |form|
             [
               form.css('div input:nth-child(1)').first.attributes['value'],
               form.css('span').first.text.gsub(/\302\240/, ' ')
@@ -159,4 +189,4 @@ module Cucumber
       end
     end
   end
-end
+end

data/templates/feature/feature.erb

@@ -25,28 +25,26 @@ Feature: Manage <%= plural_name %>
   # Rails generates Delete links that use Javascript to pop up a confirmation
   # dialog and then do a HTTP POST request (emulated DELETE request).
   #
-  # Capybara must use Culerity or Selenium2 (webdriver) when pages rely on
-  # Javascript events. Only Culerity supports confirmation dialogs.
+  # Capybara must use Culerity/Celerity or Selenium2 (webdriver) when pages rely
+  # on Javascript events. Only Culerity/Celerity supports clicking on confirmation
+  # dialogs.
   #
-  # Since Culerity and Selenium2 has some overhead, Cucumber-Rails will detect 
-  # the presence of Javascript behind Delete links and issue a DELETE request 
+  # Since Culerity/Celerity and Selenium2 has some overhead, Cucumber-Rails will
+  # detect the presence of Javascript behind Delete links and issue a DELETE request 
   # instead of a GET request.
   #
-  # You can turn off this emulation by tagging your scenario with @selenium, 
-  # @culerity, @celerity or @javascript. (See the Capybara documentation for 
-  # details about those tags). If any of these tags are present, Cucumber-Rails
+  # You can turn this emulation off by tagging your scenario with @no-js-emulation.
+  # Turning on browser testing with @selenium, @culerity, @celerity or @javascript
+  # will also turn off the emulation. (See the Capybara documentation for 
+  # details about those tags). If any of the browser tags are present, Cucumber-Rails
   # will also turn off transactions and clean the database with DatabaseCleaner 
   # after the scenario has finished. This is to prevent data from leaking into 
   # the next scenario.
   #
-  # Another way to avoid Cucumber-Rails'' javascript emulation without using any
+  # Another way to avoid Cucumber-Rails' javascript emulation without using any
   # of the tags above is to modify your views to use <button> instead. You can
   # see how in http://github.com/jnicklas/capybara/issues#issue/12
   #
-  # TODO: Verify with Rob what this means: The rack driver will detect the 
-  # onclick javascript and emulate its behaviour without a real Javascript
-  # interpreter.
-  #
 <% if options[:capybara] -%>
   @<%= options[:capybara] %>  
 <% end -%>

data/templates/feature/steps.erb

@@ -3,7 +3,7 @@ Given /^the following <%= plural_name %>:$/ do |<%= plural_name %>|
 end
 
 When /^I delete the (\d+)(?:st|nd|rd|th) <%= singular_name %>$/ do |pos|
-  visit <%= plural_name %>_url
+  visit <%= plural_name %>_path
   within("table tr:nth-child(#{pos.to_i+1})") do
     click_link "Destroy"
   end

data/templates/skeleton/config/cucumber.yml.erb

@@ -1,7 +1,8 @@
 <%%
 rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
-rerun_opts = rerun.to_s.strip.empty? ? "--format progress features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
-std_opts = "#{rerun_opts} --format rerun --out rerun.txt --strict --tags ~@wip"
+rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
+std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} --strict --tags ~@wip"
 %>
-default: <%= spork? ? '--drb ' : '' %><%%= std_opts %>
+default: <%= spork? ? '--drb ' : '' %><%%= std_opts %> features
 wip: <%= spork? ? '--drb ' : '' %>--tags @wip:3 --wip features
+rerun: <%= spork? ? '--drb ' : '' %><%%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip

data/templates/skeleton/environments/cucumber.rb.erb

@@ -24,7 +24,7 @@ config.action_mailer.delivery_method = :test
 config.gem 'cucumber-rails',   :lib => false, :version => '>=<%= version %>' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber-rails'))
 config.gem 'database_cleaner', :lib => false, :version => '>=0.5.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/database_cleaner'))
 <% if driver == :capybara -%>
-config.gem 'capybara',         :lib => false, :version => '>=0.3.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/capybara'))
+config.gem 'capybara',         :lib => false, :version => '>=0.3.5' unless File.directory?(File.join(Rails.root, 'vendor/plugins/capybara'))
 <% else -%>
 config.gem 'webrat',           :lib => false, :version => '>=0.7.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat'))
 <% end -%>

data/templates/skeleton/step_definitions/capybara_steps.rb.erb

@@ -1,6 +1,7 @@
 <%= embed_file('support/edit_warning.txt') %>
 
 require 'uri'
+require 'cgi'
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
 
 module WithinHelpers
@@ -91,9 +92,16 @@ When /^(?:|I )attach the file "([^\"]*)" to "([^\"]*)"(?: within "([^\"]*)")?$/
   end
 end
 
+Then /^(?:|I )should see JSON:$/ do |expected_json|
+  require 'json'
+  expected = JSON.pretty_generate(JSON.parse(expected_json))
+  actual   = JSON.pretty_generate(JSON.parse(response.body))
+  expected.should == actual
+end
+
 Then /^(?:|I )should see "([^\"]*)"(?: within "([^\"]*)")?$/ do |text, selector|
   with_scope(selector) do
-    if defined?(Spec::Rails::Matchers)
+    if page.respond_to? :should
       page.should have_content(text)
     else
       assert page.has_content?(text)
@@ -104,7 +112,7 @@ end
 Then /^(?:|I )should see \/([^\/]*)\/(?: within "([^\"]*)")?$/ do |regexp, selector|
   regexp = Regexp.new(regexp)
   with_scope(selector) do
-    if defined?(Spec::Rails::Matchers)
+    if page.respond_to? :should
       page.should have_xpath('//*', :text => regexp)
     else
       assert page.has_xpath?('//*', :text => regexp)
@@ -114,7 +122,7 @@ end
 
 Then /^(?:|I )should not see "([^\"]*)"(?: within "([^\"]*)")?$/ do |text, selector|
   with_scope(selector) do
-    if defined?(Spec::Rails::Matchers)
+    if page.respond_to? :should
       page.should have_no_content(text)
     else
       assert page.has_no_content?(text)
@@ -125,7 +133,7 @@ end
 Then /^(?:|I )should not see \/([^\/]*)\/(?: within "([^\"]*)")?$/ do |regexp, selector|
   regexp = Regexp.new(regexp)
   with_scope(selector) do
-    if defined?(Spec::Rails::Matchers)
+    if page.respond_to? :should
       page.should have_no_xpath('//*', :text => regexp)
     else
       assert page.has_no_xpath?('//*', :text => regexp)
@@ -135,57 +143,66 @@ end
 
 Then /^the "([^\"]*)" field(?: within "([^\"]*)")? should contain "([^\"]*)"$/ do |field, selector, value|
   with_scope(selector) do
-    if defined?(Spec::Rails::Matchers)
-      find_field(field).value.should =~ /#{value}/
+    field = find_field(field)
+    field_value = (field.tag_name == 'textarea') ? field.text : field.value
+    if field_value.respond_to? :should
+      field_value.should =~ /#{value}/
     else
-      assert_match(/#{value}/, field_labeled(field).value)
+      assert_match(/#{value}/, field_value)
     end
   end
 end
 
 Then /^the "([^\"]*)" field(?: within "([^\"]*)")? should not contain "([^\"]*)"$/ do |field, selector, value|
   with_scope(selector) do
-    if defined?(Spec::Rails::Matchers)
-      find_field(field).value.should_not =~ /#{value}/
+    field = find_field(field)
+    field_value = (field.tag_name == 'textarea') ? field.text : field.value
+    if field_value.respond_to? :should_not
+      field_value.should_not =~ /#{value}/
     else
-      assert_no_match(/#{value}/, find_field(field).value)
+      assert_no_match(/#{value}/, field_value)
     end
   end
 end
 
 Then /^the "([^\"]*)" checkbox(?: within "([^\"]*)")? should be checked$/ do |label, selector|
   with_scope(selector) do
-    if defined?(Spec::Rails::Matchers)
-      find_field(label)['checked'].should == 'checked'
+    field_checked = find_field(label)['checked']
+    if field_checked.respond_to? :should
+      field_checked.should == 'checked'
     else
-      assert_equal 'checked', field_labeled(label)['checked']
+      assert_equal 'checked', field_checked
     end
   end
 end
 
 Then /^the "([^\"]*)" checkbox(?: within "([^\"]*)")? should not be checked$/ do |label, selector|
   with_scope(selector) do
-    if defined?(Spec::Rails::Matchers)
-      find_field(label)['checked'].should_not == 'checked'
+    field_checked = find_field(label)['checked']
+    if field_checked.respond_to? :should_not
+      field_checked.should_not == 'checked'
     else
-      assert_not_equal 'checked', field_labeled(label)['checked']
+      assert_not_equal 'checked', field_checked
     end
   end
 end
  
 Then /^(?:|I )should be on (.+)$/ do |page_name|
-  if defined?(Spec::Rails::Matchers)
-    URI.parse(current_url).path.should == path_to(page_name)
+  current_path = URI.parse(current_url).path
+  if current_path.respond_to? :should
+    current_path.should == path_to(page_name)
   else
-    assert_equal path_to(page_name), URI.parse(current_url).path
+    assert_equal path_to(page_name), current_path
   end
 end
 
 Then /^(?:|I )should have the following query string:$/ do |expected_pairs|
-  actual_params   = CGI.parse(URI.parse(current_url).query)
-  expected_params = Hash[expected_pairs.rows_hash.map{|k,v| [k,[v]]}]
- 
-  if defined?(Spec::Rails::Matchers)
+  query = URI.parse(current_url).query
+  actual_params = query ? CGI.parse(query) : {}
+  expected_params = {}
+  expected_pairs.rows_hash.each_pair{|k,v| expected_params[k] = v.split(',')} 
+  
+  if actual_params.respond_to? :should
     actual_params.should == expected_params
   else
     assert_equal expected_params, actual_params