cucumber-rails 0.1.1.rc4 → 0.1.1.rc5

data/History.txt

@@ -1,6 +1,9 @@
 == In Git
 
 === New features
+* Added an @emulate_rails_javascript tag that will emulate onclick with Capybara (Aslak Hellesøy, Rob Holland)
+* Added a smart config/cucumber.yml file that will rerun previously failing scenarios (Aslak Hellesøy)
+* Support for Capybara. Run "script/generate --capybara" if you want that. (Rob Holland, Aslak Hellesøy)
 * New #tableish method to extract table-like data from a HTML page. Pure Nokogiri/CSS3/XPath. (Aslak Hellesøy)
 
 === Bugfixes

data/VERSION

@@ -1 +1 @@
-0.1.1.rc4
+0.1.1.rc5

data/cucumber-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cucumber-rails}
-  s.version = "0.1.1.rc4"
+  s.version = "0.1.1.rc5"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dennis Bl\303\266te", "Aslak Helles\303\270y", "Rob Holland"]
-  s.date = %q{2009-12-07}
+  s.date = %q{2009-12-09}
   s.description = %q{Cucumber Generators and Runtime for Rails}
   s.email = %q{cukes@googlegroups.com}
   s.extra_rdoc_files = [
@@ -24,25 +24,30 @@ Gem::Specification.new do |s|
      "cucumber-rails.gemspec",
      "generators/cucumber/USAGE",
      "generators/cucumber/cucumber_generator.rb",
-     "generators/cucumber/templates/capybara_env.rb",
-     "generators/cucumber/templates/cucumber",
-     "generators/cucumber/templates/cucumber.rake",
-     "generators/cucumber/templates/cucumber_environment.rb",
-     "generators/cucumber/templates/env.rb",
-     "generators/cucumber/templates/paths.rb",
-     "generators/cucumber/templates/spork_env.rb",
-     "generators/cucumber/templates/web_steps/capybara_steps.rb",
-     "generators/cucumber/templates/web_steps/web_steps_de.rb",
-     "generators/cucumber/templates/web_steps/web_steps_no.rb",
-     "generators/cucumber/templates/web_steps/web_steps_pt-BR.rb",
-     "generators/cucumber/templates/web_steps/webrat_steps.rb",
-     "generators/cucumber/templates/webrat_env.rb",
+     "generators/cucumber/templates/config/cucumber.yml.erb",
+     "generators/cucumber/templates/environments/cucumber.rb.erb",
+     "generators/cucumber/templates/script/cucumber",
+     "generators/cucumber/templates/step_definitions/capybara_steps.rb.erb",
+     "generators/cucumber/templates/step_definitions/web_steps_de.rb.erb",
+     "generators/cucumber/templates/step_definitions/web_steps_no.rb.erb",
+     "generators/cucumber/templates/step_definitions/web_steps_pt-BR.rb.erb",
+     "generators/cucumber/templates/step_definitions/webrat_steps.rb.erb",
+     "generators/cucumber/templates/support/_rails_each_run.rb",
+     "generators/cucumber/templates/support/_rails_prefork.rb.erb",
+     "generators/cucumber/templates/support/capybara.rb",
+     "generators/cucumber/templates/support/edit_warning.txt",
+     "generators/cucumber/templates/support/paths.rb",
+     "generators/cucumber/templates/support/rails.rb.erb",
+     "generators/cucumber/templates/support/rails_spork.rb.erb",
+     "generators/cucumber/templates/support/webrat.rb",
+     "generators/cucumber/templates/tasks/cucumber.rake.erb",
      "generators/feature/USAGE",
      "generators/feature/feature_generator.rb",
      "generators/feature/templates/feature.erb",
      "generators/feature/templates/steps.erb",
      "lib/cucumber/rails/action_controller.rb",
      "lib/cucumber/rails/active_record.rb",
+     "lib/cucumber/rails/capybara_javascript_emulation.rb",
      "lib/cucumber/rails/rspec.rb",
      "lib/cucumber/rails/test_unit.rb",
      "lib/cucumber/rails/world.rb",

data/generators/cucumber/cucumber_generator.rb

@@ -8,58 +8,68 @@ class CucumberGenerator < Rails::Generator::Base
 
   attr_accessor :driver
   attr_accessor :framework
-  attr_reader :language
+  attr_reader :language, :template_dir
   
   def initialize(runtime_args, runtime_options = {})
-      super
-      @language = @args.empty? ? 'en' : @args.first
+    super
+    @language = @args.empty? ? 'en' : @args.first
   end
   
   def manifest
     record do |m|
+      m.template 'config/cucumber.yml.erb', 'config/cucumber.yml'
+
+      m.template 'environments/cucumber.rb.erb', 'config/environments/cucumber.rb'
+
+      m.file 'script/cucumber', 'script/cucumber', {
+        :chmod => 0755, :shebang => options[:shebang] == DEFAULT_SHEBANG ? nil : options[:shebang]
+      }
+
       m.directory 'features/step_definitions'
-      
-      m.template "web_steps/#{driver}_steps.rb", 'features/step_definitions/web_steps.rb'
+      m.template "step_definitions/#{driver}_steps.rb.erb", 'features/step_definitions/web_steps.rb'
       if language != 'en'
-        m.template "web_steps/web_steps_#{language}.rb", "features/step_definitions/web_steps_#{language}.rb"
-      end
-      m.template 'cucumber_environment.rb', 'config/environments/cucumber.rb'
-
-      m.gsub_file 'config/database.yml', /test:.*\n/, "test: &TEST\n"
-      unless File.read('config/database.yml').include? 'cucumber:'
-        m.gsub_file 'config/database.yml', /\z/, "\ncucumber:\n  <<: *TEST"
+        m.template "step_definitions/web_steps_#{language}.rb.erb", "features/step_definitions/web_steps_#{language}.rb"
       end
 
       m.directory 'features/support'
       if spork?
-        m.template'spork_env.rb', 'features/support/env.rb'
+        m.template 'support/rails_spork.rb.erb', 'features/support/env.rb'
       else
-        m.template 'env.rb', 'features/support/env.rb'
-        m.template "#{driver}_env.rb", "features/support/#{driver}.rb"
+        m.template 'support/rails.rb.erb',       'features/support/env.rb'
       end
-      m.template 'paths.rb', 'features/support/paths.rb'
+      m.file       'support/paths.rb',           'features/support/paths.rb'
 
       m.directory 'lib/tasks'
-      m.template'cucumber.rake', 'lib/tasks/cucumber.rake'
+      m.template  'tasks/cucumber.rake.erb',     'lib/tasks/cucumber.rake'
 
-      m.file 'cucumber', 'script/cucumber', {
-        :chmod => 0755, :shebang => options[:shebang] == DEFAULT_SHEBANG ? nil : options[:shebang]
-      }
+      m.gsub_file 'config/database.yml', /test:.*\n/, "test: &TEST\n"
+      unless File.read('config/database.yml').include? 'cucumber:'
+        m.gsub_file 'config/database.yml', /\z/, "\ncucumber:\n  <<: *TEST"
+      end
     end
   end
 
   def framework
-    options[:framework] ||= detect_default_framework!
+    options[:framework] ||= detect_current_framework || detect_default_framework
   end
 
   def driver
-    options[:driver] ||= detect_current_driver! || detect_default_driver!
+    options[:driver] ||= detect_current_driver || detect_default_driver
   end
 
   def spork?
     options[:spork]
   end
 
+  def embed_file(source, indent='')
+    IO.read(File.join(File.dirname(__FILE__), 'templates', source)).gsub(/^/, indent)
+  end
+
+  def embed_template(source, indent='')
+    template = File.join(File.dirname(__FILE__), 'templates', source)
+    ERB.new(IO.read(template), nil, '-').result(binding).gsub(/^/, indent)
+  end
+
 private
 
   def first_loadable(libraries)
@@ -74,28 +84,35 @@ private
     return nil
   end
 
-  def detect_current_driver!
-    drivers = [['capybara', :capybara], ['webrat', :webrat ]]
-    drivers.each do |driver|
-      @current_driver = driver[1] if File.exists?("features/support/#{driver[0]}.rb")
-      return @current_driver if @current_driver
-    end
-    return nil
+  def detect_current_driver
+    detect_in_env([['capybara', :capybara], ['webrat', :webrat ]])
   end
 
-  def detect_default_driver!
-    drivers = [['capybara', :capybara], ['webrat', :webrat ]]
-    @default_driver = first_loadable(drivers)
+  def detect_default_driver
+    @default_driver = first_loadable([['capybara', :capybara], ['webrat', :webrat ]])
     raise "I don't know which driver you want. Use --capybara or --webrat, or gem install capybara or webrat." unless @default_driver
     @default_driver
   end
 
-  def detect_default_framework!
+  def detect_current_framework
+    detect_in_env([['spec', :rspec], ['test/unit', :testunit]])
+  end
+
+  def detect_default_framework
     @default_framework = first_loadable([['spec', :rspec], ['test/unit', :testunit]])
     raise "I don't know what test framework you want. Use --rspec or --testunit, or gem install rspec or test-unit." unless @default_framework
     @default_framework
   end
 
+  def detect_in_env(choices)
+    env = File.file?("features/support/env.rb") ? IO.read("features/support/env.rb") : ''
+    choices.each do |choice|
+      detected = choice[1] if env =~ /#{choice[0]}/n
+      return detected if detected
+    end
+    return nil
+  end
+
   def banner
     "Usage: #{$0} cucumber (language)"
   end

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

@@ -0,0 +1,7 @@
+<%%
+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"
+%>
+default: <%= spork? ? '--drb ' : '' %><%%= std_opts %>
+wip: <%= spork? ? '--drb ' : '' %>--tags @wip:3 --wip features

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

@@ -0,0 +1,38 @@
+# Edit at your own peril - it's recommended to regenerate this file
+# in the future when you upgrade to a newer version of Cucumber.
+
+# IMPORTANT: Setting config.cache_classes to false is known to
+# break Cucumber's use_transactional_fixtures method.
+# For more information see https://rspec.lighthouseapp.com/projects/16211/tickets/165
+config.cache_classes = true
+
+# Log error messages when you accidentally call methods on nil.
+config.whiny_nils = true
+
+# Show full error reports and disable caching
+config.action_controller.consider_all_requests_local = true
+config.action_controller.perform_caching             = false
+
+# Disable request forgery protection in test environment
+config.action_controller.allow_forgery_protection    = false
+
+# Tell Action Mailer not to deliver emails to the real world.
+# The :test delivery method accumulates sent emails in the
+# ActionMailer::Base.deliveries array.
+config.action_mailer.delivery_method = :test
+
+config.gem 'cucumber',         :lib => false, :version => '>=<%= Cucumber::VERSION %>' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber'))
+<% if driver == :capybara -%>
+config.gem 'capybara',         :lib => false, :version => '>=0.1.3' unless File.directory?(File.join(Rails.root, 'vendor/plugins/capybara'))
+<% else -%>
+config.gem 'webrat',           :lib => false, :version => '>=0.5.3' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat'))
+<% end -%>
+<% if framework == :rspec -%>
+config.gem 'rspec',            :lib => false, :version => '>=1.2.9' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec'))
+config.gem 'rspec-rails',      :lib => false, :version => '>=1.2.9' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails'))
+# If you never turn off transactions you may remove the dependency on database_cleaner.
+config.gem 'database_cleaner', :lib => false, :version => '>=0.2.3' unless File.directory?(File.join(Rails.root, 'vendor/plugins/database_cleaner'))
+<% end %>
+<% if spork? -%>
+config.gem 'spork',            :lib => false, :version => '>=0.7.3' unless File.directory?(File.join(Rails.root, 'vendor/plugins/spork'))
+<% end %>

data/generators/cucumber/templates/{web_steps/capybara_steps.rb → step_definitions/capybara_steps.rb.erb}

@@ -1,7 +1,4 @@
-# IMPORTANT: This file was generated.
-# Edit at your own peril - it's recommended to regenerate this file
-# in the future when you upgrade to a newer version of Cucumber.
-# Consider adding your own code to a new file instead of editing this one.
+<%= embed_file('support/edit_warning.txt') %>
 
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
 

data/generators/cucumber/templates/{web_steps/web_steps_de.rb → step_definitions/web_steps_de.rb.erb}

@@ -1,8 +1,5 @@
 # encoding: utf-8
-# IMPORTANT: This file was generated.
-# Edit at your own peril - it's recommended to regenerate this file
-# in the future when you upgrade to a newer version of Cucumber.
-# Consider adding your own code to a new file instead of editing this one.
+<%= embed_file('support/edit_warning.txt') %>
 
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
 

data/generators/cucumber/templates/{web_steps/web_steps_no.rb → step_definitions/web_steps_no.rb.erb}

@@ -1,8 +1,5 @@
 # encoding: utf-8
-# IMPORTANT: This file was generated.
-# Edit at your own peril - it's recommended to regenerate this file
-# in the future When you upgrade to a newer version of Cucumber.
-# Consider adding your own code to a new file instead of editing this one.
+<%= embed_file('support/edit_warning.txt') %>
 
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
 

data/generators/cucumber/templates/{web_steps/web_steps_pt-BR.rb → step_definitions/web_steps_pt-BR.rb.erb}

@@ -1,8 +1,5 @@
 # encoding: utf-8
-# IMPORTANT: This file was generated.
-# Edit at your own peril - it's recommended to regenerate this file
-# in the future when you upgrade to a newer version of Cucumber.
-# Consider adding your own code to a new file instead of editing this one.
+<%= embed_file('support/edit_warning.txt') %>
 
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
 

data/generators/cucumber/templates/{web_steps/webrat_steps.rb → step_definitions/webrat_steps.rb.erb}

@@ -1,7 +1,4 @@
-# IMPORTANT: This file was generated.
-# Edit at your own peril - it's recommended to regenerate this file
-# in the future when you upgrade to a newer version of Cucumber.
-# Consider adding your own code to a new file instead of editing this one.
+<%= embed_file('support/edit_warning.txt') %>
 
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
 

data/generators/cucumber/templates/support/_rails_each_run.rb

@@ -0,0 +1,29 @@
+# If you set this to false, any error raised from within your app will bubble 
+# up to your step definition and out to cucumber unless you catch it somewhere
+# on the way. You can make Rails rescue errors and render error pages on a
+# per-scenario basis by tagging a scenario or feature with the @allow-rescue tag.
+#
+# If you set this to true, Rails will rescue all errors and render error
+# pages, more or less in the same way your application would behave in the
+# default production environment. It's not recommended to do this for all
+# of your scenarios, as this makes it hard to discover errors in your application.
+ActionController::Base.allow_rescue = false
+
+# If you set this to true, each scenario will run in a database transaction.
+# You can still turn off transactions on a per-scenario basis, simply tagging 
+# a feature or scenario with the @no-txn tag. If you are using Capybara,
+# tagging with @culerity or @javascript will also turn transactions off.
+#
+# If you set this to false, transactions will be off for all scenarios,
+# regardless of whether you use @no-txn or not.
+#
+# Beware that turning transactions off will leave data in your database 
+# after each scenario, which can lead to hard-to-debug failures in 
+# subsequent scenarios. If you do this, we recommend you create a Before
+# block that will explicitly put your database in a known state.
+Cucumber::Rails::World.use_transactional_fixtures = true
+
+# How to clean your database when transactions are turned off. See
+# http://github.com/bmabey/database_cleaner for more info.
+require 'database_cleaner'
+DatabaseCleaner.strategy = :truncation

data/generators/cucumber/templates/support/_rails_prefork.rb.erb

@@ -0,0 +1,16 @@
+ENV["RAILS_ENV"] ||= "cucumber"
+require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
+
+require 'cucumber/formatter/unicode' # Remove this line if you don't want Cucumber Unicode support
+<% if framework == :rspec -%>
+require 'cucumber/rails/rspec'
+<% end -%>
+require 'cucumber/rails/world'
+require 'cucumber/rails/active_record'
+require 'cucumber/web/tableish'
+<% if driver == :webrat -%>
+require 'cucumber/webrat/element_locator' # Deprecated in favor of #tableish - remove this line if you don't use #element_at or #table_at
+<% end -%>
+<% if driver == :capybara -%>
+require 'cucumber/rails/capybara_javascript_emulation' # Lets you click links with onclick javascript handlers without using @culerity or @javascript
+<% end -%>

data/generators/cucumber/templates/support/capybara.rb

@@ -0,0 +1,8 @@
+require 'capybara/rails'
+require 'capybara/cucumber'
+require 'capybara/session'
+# Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In
+# order to ease the transition to Capybara we set the default here. If you'd
+# prefer to use XPath just remove this line and adjust any selectors in your
+# steps to use the XPath syntax.
+Capybara.default_selector = :css

data/generators/cucumber/templates/support/edit_warning.txt

@@ -0,0 +1,4 @@
+# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
+# It is recommended to regenerate this file in the future when you upgrade to a 
+# newer version of cucumber-rails. Consider adding your own code to a new file 
+# instead of editing this one.

data/generators/cucumber/templates/support/rails.rb.erb

@@ -0,0 +1,4 @@
+<%= embed_file('support/edit_warning.txt') %>
+<%= embed_template('support/_rails_prefork.rb.erb') %>
+<%= embed_file("support/#{driver}.rb") %>
+<%= embed_file('support/_rails_each_run.rb') %>

data/generators/cucumber/templates/support/rails_spork.rb.erb

@@ -0,0 +1,13 @@
+<%= embed_file('support/edit_warning.txt') %>
+require 'rubygems'
+require 'spork'
+ 
+Spork.prefork do
+<%= embed_template('support/_rails_prefork.rb.erb', '  ') %>
+
+<%= embed_file("support/#{driver}.rb", '  ') %>
+end
+ 
+Spork.each_run do
+<%= embed_file('support/_rails_each_run.rb', '  ') %>
+end

data/generators/cucumber/templates/support/webrat.rb

@@ -0,0 +1,8 @@
+require 'webrat'
+require 'webrat/core/matchers'
+
+Webrat.configure do |config|
+  config.mode = :rails
+  config.open_error_files = false # Set to true if you want error pages to pop up in the browser
+end
+

data/generators/cucumber/templates/{cucumber.rake → tasks/cucumber.rake.erb}

@@ -16,13 +16,13 @@ begin
     Cucumber::Rake::Task.new({:ok => 'db:test:prepare'}, 'Run features that should pass') do |t|
       t.binary = vendored_cucumber_binary
       t.fork = true # You may get faster startup if you set this to false
-      t.cucumber_opts = "--color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}<%= spork? ? ' --drb' : '' %>"
+      t.profile = 'default'
     end
 
     Cucumber::Rake::Task.new({:wip => 'db:test:prepare'}, 'Run features that are being worked on') do |t|
       t.binary = vendored_cucumber_binary
       t.fork = true # You may get faster startup if you set this to false
-      t.cucumber_opts = "--color --tags @wip:2 --wip --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}<%= spork? ? ' --drb' : '' %>"
+      t.profile = 'wip'
     end
 
     desc 'Run all features'

data/generators/feature/templates/feature.erb

@@ -21,6 +21,30 @@ Feature: Manage <%= plural_name %>
 <% keyword = 'And' -%>
 <% end -%>
 
+<% if IO.read('features/support/env.rb') =~ /capybara/n -%>
+  # 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.
+  # 
+  # cucumber-rails will turn off transactions for scenarios tagged with 
+  # @culerity, @javascript or @no-txn and clean the database with DatabaseCleaner.
+  # after the scenario has finished. This is to prevent data from leaking into
+  # the next scenario.
+  #
+  # Culerity has some performance overhead, and there are two alternatives to using
+  # Culerity:
+  #
+  # a) You can remove the @culerity tag and run everything in-process, but then you 
+  # also have to modify your views to use <button> instead: http://github.com/jnicklas/capybara/issues#issue/12
+  #
+  # b) Replace the @culerity tag with @emulate_rails_javascript. This will detect
+  # the onclick javascript and emulate its behaviour without a real Javascript
+  # interpreter.
+  #
+  @culerity
+<% end -%>
   Scenario: Delete <%= singular_name %>
     Given the following <%= plural_name %>:
       |<%= named_args.map(&:name).join('|') %>|

data/generators/feature/templates/steps.erb

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

data/lib/cucumber/rails/active_record.rb

@@ -3,17 +3,19 @@ if defined?(ActiveRecord::Base)
     $__cucumber_global_use_txn = !!Cucumber::Rails::World.use_transactional_fixtures if $__cucumber_global_use_txn.nil?
   end
 
-  Before('~@no-txn') do
+  Before('~@no-txn', '~@culerity', '~@javascript') do
     Cucumber::Rails::World.use_transactional_fixtures = $__cucumber_global_use_txn
   end
 
-  Before('@no-txn') do
+  Before('@no-txn', '@culerity', '@javascript') do
     Cucumber::Rails::World.use_transactional_fixtures = false
   end
 
   Before do
     if Cucumber::Rails::World.use_transactional_fixtures
       run_callbacks :setup if respond_to?(:run_callbacks)
+    else
+      DatabaseCleaner.start
     end
     ActionMailer::Base.deliveries = [] if defined?(ActionMailer::Base)
   end
@@ -21,6 +23,8 @@ if defined?(ActiveRecord::Base)
   After do
     if Cucumber::Rails::World.use_transactional_fixtures
       run_callbacks :teardown if respond_to?(:run_callbacks)
+    else
+      DatabaseCleaner.clean
     end
   end
 else

data/lib/cucumber/rails/capybara_javascript_emulation.rb

@@ -0,0 +1,47 @@
+module Cucumber
+  module Rails
+    module CapybaraJavascriptEmulation
+      def self.included(base)
+        base.class_eval do
+          alias_method :click_without_rails_javascript_emulation, :click
+        end
+      end
+  
+      def click_with_rails_javascript_emulation
+        if tag_name == 'a' and node['onclick'] =~ /m\.setAttribute\('name', '_method'\)/
+          method = node['onclick'].match(/m\.setAttribute\('value', '([^']*)'\)/)[1]
+ 
+          js_form = node.document.create_element('form')
+          js_form['action'] = self[:href]
+          js_form['method'] = 'POST'
+ 
+          input = node.document.create_element('input')
+          input['type'] = 'hidden'
+          input['name'] = '_method'
+          input['value'] = method
+          js_form.add_child(input)
+ 
+          Capybara::Driver::RackTest::Form.new(driver, js_form).submit(self)
+        else
+          click_without_rails_javascript_emulation
+        end
+      end
+    end
+  end
+end
+
+class Capybara::Driver::RackTest::Node
+  include Cucumber::Rails::CapybaraJavascriptEmulation
+end
+ 
+Before('@emulate_rails_javascript') do
+  Capybara::Driver::RackTest::Node.class_eval do
+    alias_method :click, :click_with_rails_javascript_emulation
+  end
+end
+ 
+After('@emulate_rails_javascript') do
+  Capybara::Driver::RackTest::Node.class_eval do
+    alias_method :click, :click_without_rails_javascript_emulation
+  end
+end

data/lib/cucumber/rails/world.rb

@@ -23,8 +23,6 @@ module Cucumber #:nodoc:
   end
 end
 
-require 'cucumber/rails/active_record'
-
 World do
   Cucumber::Rails::World.new
 end

data/lib/cucumber/web/tableish.rb

@@ -2,12 +2,53 @@ require 'nokogiri'
 
 module Cucumber
   module Tableish
+    # 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
+    # from the web page's DOM. If the number of cells in each row differs, it
+    # will be constrained by (or padded with) the number of cells in the first row
+    #
+    # The +column_selectors+ argument must be a String or a Proc, picking out
+    # cells from each row. If you pass a Proc, it will be yielded an instance
+    # of Nokogiri::HTML::Element.
+    #
+    # == Example with a table
+    #
+    #   <table id="tools">
+    #     <tr>
+    #       <th>tool</th>
+    #       <th>dude</th>
+    #     </tr>
+    #     <tr>
+    #       <td>webrat</td>
+    #       <td>bryan</td>
+    #     </tr>
+    #     <tr>
+    #       <td>cucumber</td>
+    #       <td>aslak</td>
+    #     </tr>
+    #   </table>
+    #
+    #   t = tableish('table#tools tr', 'td,th')
+    #
+    # == Example with a dl
+    #
+    #   <dl id="tools">
+    #     <dt>webrat</dt>
+    #     <dd>bryan</dd>
+    #     <dt>cucumber</dt>
+    #     <dd>aslak</dd>
+    #   </dl>
+    #
+    #   t = tableish('dl#tools dt', lambda{|dt| [dt, dt.next.next]})
+    #
     def tableish(row_selector, column_selectors)
       html = defined?(Capybara) ? body : response_body
       _tableish(html, row_selector, column_selectors)
     end
 
-    def _tableish(html, row_selector, column_selectors)
+    def _tableish(html, row_selector, column_selectors) #:nodoc
       doc = Nokogiri::HTML(html)
       column_count = nil
       doc.search(row_selector).map do |row|
@@ -18,10 +59,13 @@ module Cucumber
           column_selectors.call(row)
         end
         column_count ||= cells.length
-        cells[0...column_count].map do |cell|
-          cell.text.strip
+        (0...column_count).map do |n|
+          cell = cells[n]
+          cell ? cell.text.strip : ''
         end
       end
     end
   end
 end
+
+World(Cucumber::Tableish)

data/spec/cucumber/web/tableish_spec.rb

@@ -1,4 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
+
+def World(*a); end
 require 'cucumber/web/tableish'
 
 module Cucumber
@@ -9,7 +11,7 @@ module Cucumber
       unless RUBY_PLATFORM =~ /java/
         it "should convert a table" do
           html = <<-HTML
-            <table>
+            <table id="tools">
               <tr>
                 <th>tool</th>
                 <th>dude</th>
@@ -25,7 +27,7 @@ module Cucumber
             </table>
           HTML
 
-          _tableish(html, 'table tr', 'td,th').should == [
+          _tableish(html, 'table#tools tr', 'td,th').should == [
             %w{tool dude},
             %w{webrat bryan},
             %w{cucumber aslak}
@@ -34,7 +36,7 @@ module Cucumber
 
         it "should size to the first row" do
           html = <<-HTML
-            <table>
+            <table id="tools">
               <tr>
                 <th>tool</th>
                 <th>dude</th>
@@ -53,16 +55,40 @@ module Cucumber
             </table>
           HTML
 
-          _tableish(html, 'table tr', 'td,th').should == [
+          _tableish(html, 'table#tools tr', 'td,th').should == [
             %w{tool dude},
             %w{webrat bryan},
             %w{cucumber aslak}
           ]
         end
 
+        it "should pad with empty Strings if some rows are shorter" do
+          html = <<-HTML
+            <table id="tools">
+              <tr>
+                <th>tool</th>
+                <th>dude</th>
+              </tr>
+              <tr>
+                <td>webrat</td>
+                <td>bryan</td>
+              </tr>
+              <tr>
+                <td>cucumber</td>
+              </tr>
+            </table>
+          HTML
+
+          _tableish(html, 'table#tools tr', 'td,th').should == [
+            %w{tool dude},
+            %w{webrat bryan},
+            ['cucumber', '']
+          ]
+        end
+
         it "should convert a dl" do
           html = <<-HTML
-            <dl>
+            <dl id="tools">
               <dt>webrat</dt>
               <dd>bryan</dd>
               <dt>cucumber</dt>
@@ -70,7 +96,7 @@ module Cucumber
             </dl>
           HTML
 
-          _tableish(html, 'dl dt', lambda{|dt| [dt, dt.next.next]}).should == [
+          _tableish(html, 'dl#tools dt', lambda{|dt| [dt, dt.next.next]}).should == [
             %w{webrat bryan},
             %w{cucumber aslak}
           ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber-rails
 version: !ruby/object:Gem::Version 
-  version: 0.1.1.rc4
+  version: 0.1.1.rc5
 platform: ruby
 authors: 
 - "Dennis Bl\xC3\xB6te"
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-07 00:00:00 +01:00
+date: 2009-12-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,25 +41,30 @@ files:
 - cucumber-rails.gemspec
 - generators/cucumber/USAGE
 - generators/cucumber/cucumber_generator.rb
-- generators/cucumber/templates/capybara_env.rb
-- generators/cucumber/templates/cucumber
-- generators/cucumber/templates/cucumber.rake
-- generators/cucumber/templates/cucumber_environment.rb
-- generators/cucumber/templates/env.rb
-- generators/cucumber/templates/paths.rb
-- generators/cucumber/templates/spork_env.rb
-- generators/cucumber/templates/web_steps/capybara_steps.rb
-- generators/cucumber/templates/web_steps/web_steps_de.rb
-- generators/cucumber/templates/web_steps/web_steps_no.rb
-- generators/cucumber/templates/web_steps/web_steps_pt-BR.rb
-- generators/cucumber/templates/web_steps/webrat_steps.rb
-- generators/cucumber/templates/webrat_env.rb
+- generators/cucumber/templates/config/cucumber.yml.erb
+- generators/cucumber/templates/environments/cucumber.rb.erb
+- generators/cucumber/templates/script/cucumber
+- generators/cucumber/templates/step_definitions/capybara_steps.rb.erb
+- generators/cucumber/templates/step_definitions/web_steps_de.rb.erb
+- generators/cucumber/templates/step_definitions/web_steps_no.rb.erb
+- generators/cucumber/templates/step_definitions/web_steps_pt-BR.rb.erb
+- generators/cucumber/templates/step_definitions/webrat_steps.rb.erb
+- generators/cucumber/templates/support/_rails_each_run.rb
+- generators/cucumber/templates/support/_rails_prefork.rb.erb
+- generators/cucumber/templates/support/capybara.rb
+- generators/cucumber/templates/support/edit_warning.txt
+- generators/cucumber/templates/support/paths.rb
+- generators/cucumber/templates/support/rails.rb.erb
+- generators/cucumber/templates/support/rails_spork.rb.erb
+- generators/cucumber/templates/support/webrat.rb
+- generators/cucumber/templates/tasks/cucumber.rake.erb
 - generators/feature/USAGE
 - generators/feature/feature_generator.rb
 - generators/feature/templates/feature.erb
 - generators/feature/templates/steps.erb
 - lib/cucumber/rails/action_controller.rb
 - lib/cucumber/rails/active_record.rb
+- lib/cucumber/rails/capybara_javascript_emulation.rb
 - lib/cucumber/rails/rspec.rb
 - lib/cucumber/rails/test_unit.rb
 - lib/cucumber/rails/world.rb

data/generators/cucumber/templates/capybara_env.rb

@@ -1,24 +0,0 @@
-require 'capybara/rails'
-require 'capybara/cucumber'
-require 'cucumber/web/tableish'
-World(Cucumber::Tableish)
-
-# If you set this to true, each scenario will run in a database transaction.
-# You can still turn off transactions on a per-scenario basis, simply tagging
-# a feature or scenario with the @no-txn tag. 
-#
-# If you set this to false, transactions will be off for all scenarios,
-# regardless of whether you use @no-txn or not.
-#
-# Beware that turning transactions off will leave data in your database after
-# each scenario, which can lead to hard-to-debug failures in subsequent
-# scenarios. If you do this, we recommend you create a Before block that will
-# explicitly put your database in a known state.
-#
-Cucumber::Rails::World.use_transactional_fixtures = true
-
-# Capybara defaults to XPATH selectors rather than Webrat's default of CSS. In
-# order to ease the transition to Capybara we set the default here. If you'd
-# prefer to use XPATH just remove this line and adjust any selectors in your
-# steps to use the XPATH syntax.
-Capybara.default_selector = :css

data/generators/cucumber/templates/cucumber_environment.rb

@@ -1,36 +0,0 @@
-# Edit at your own peril - it's recommended to regenerate this file
-# in the future when you upgrade to a newer version of Cucumber.
-
-# IMPORTANT: Setting config.cache_classes to false is known to
-# break Cucumber's use_transactional_fixtures method.
-# For more information see https://rspec.lighthouseapp.com/projects/16211/tickets/165
-config.cache_classes = true
-
-# Log error messages when you accidentally call methods on nil.
-config.whiny_nils = true
-
-# Show full error reports and disable caching
-config.action_controller.consider_all_requests_local = true
-config.action_controller.perform_caching             = false
-
-# Disable request forgery protection in test environment
-config.action_controller.allow_forgery_protection    = false
-
-# Tell Action Mailer not to deliver emails to the real world.
-# The :test delivery method accumulates sent emails in the
-# ActionMailer::Base.deliveries array.
-config.action_mailer.delivery_method = :test
-
-config.gem 'cucumber',    :lib => false, :version => '>=<%= Cucumber::VERSION %>' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber'))
-<% if driver == :capybara -%>
-config.gem 'capybara',    :lib => false, :version => '>=0.1.3' unless File.directory?(File.join(Rails.root, 'vendor/plugins/capybara'))
-<% else -%>
-config.gem 'webrat',      :lib => false, :version => '>=0.5.3' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat'))
-<% end -%>
-<% if framework == :rspec -%>
-config.gem 'rspec',       :lib => false, :version => '>=1.2.9' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec'))
-config.gem 'rspec-rails', :lib => false, :version => '>=1.2.9' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails'))
-<% end %>
-<% if spork? -%>
-config.gem 'spork',       :lib => false, :version => '>=0.7.3' unless File.directory?(File.join(Rails.root, 'vendor/plugins/spork'))
-<% end %>

data/generators/cucumber/templates/env.rb

@@ -1,26 +0,0 @@
-# Edit at your own peril - it's recommended to regenerate this file
-# in the future when you upgrade to a newer version of Cucumber.
-# Consider adding your own code to a new file instead of editing this one.
-
-# Sets up the Rails environment for Cucumber
-ENV["RAILS_ENV"] ||= "cucumber"
-require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
-require 'cucumber/rails/world'
-
-# If you set this to false, any error raised from within your app will bubble 
-# up to your step definition and out to cucumber unless you catch it somewhere
-# on the way. You can make Rails rescue errors and render error pages on a
-# per-scenario basis by tagging a scenario or feature with the @allow-rescue tag.
-#
-# If you set this to true, Rails will rescue all errors and render error
-# pages, more or less in the same way your application would behave in the
-# default production environment. It's not recommended to do this for all
-# of your scenarios, as this makes it hard to discover errors in your application.
-ActionController::Base.allow_rescue = false
-
-require 'cucumber'
-# Comment out the next line if you don't want Cucumber Unicode support
-require 'cucumber/formatter/unicode'
-<% if framework == :rspec -%>
-require 'cucumber/rails/rspec'
-<% end -%>

data/generators/cucumber/templates/spork_env.rb

@@ -1,57 +0,0 @@
-# IMPORTANT: This file was generated by Cucumber <%= Cucumber::VERSION %>
-# Edit at your own peril - it's recommended to regenerate this file
-# in the future when you upgrade to a newer version of Cucumber.
-# Consider adding your own code to a new file instead of editing this one.
-
-require 'rubygems'
-require 'spork'
- 
-Spork.prefork do
-  # Sets up the Rails environment for Cucumber
-  ENV["RAILS_ENV"] = "cucumber"
-  require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
-  require 'cucumber/rails/world'
- 
-  require 'cucumber'
-  # Comment out the next line if you don't want Cucumber Unicode support
-  require 'cucumber/formatter/unicode'
-  require 'cucumber/webrat/element_locator' # Lets you do table.diff!(element_at('#my_table_or_dl_or_ul_or_ol').to_table)
-  <% if framework == :rspec -%>
-  require 'cucumber/rails/rspec'
-  <% end -%>
-
-  require 'webrat'
-  require 'webrat/core/matchers' 
-  Webrat.configure do |config|
-    config.mode = :rails
-    config.open_error_files = false # Set to true if you want error pages to pop up in the browser
-  end
-end
- 
-Spork.each_run do
-  # This code will be run each time you start cucumber.
-
-  # If you set this to true, each scenario will run in a database transaction.
-  # You can still turn off transactions on a per-scenario basis, simply tagging 
-  # a feature or scenario with the @no-txn tag. 
-  #
-  # If you set this to false, transactions will be off for all scenarios,
-  # regardless of whether you use @no-txn or not.
-  #
-  # Beware that turning transactions off will leave data in your database 
-  # after each scenario, which can lead to hard-to-debug failures in 
-  # subsequent scenarios. If you do this, we recommend you create a Before
-  # block that will explicitly put your database in a known state.
-  Cucumber::Rails::World.use_transactional_fixtures = true
-
-  # If you set this to false, any error raised from within your app will bubble 
-  # up to your step definition and out to cucumber unless you catch it somewhere
-  # on the way. You can make Rails rescue errors and render error pages on a
-  # per-scenario basis by tagging a scenario or feature with the @allow-rescue tag.
-  #
-  # If you set this to true, Rails will rescue all errors and render error
-  # pages, more or less in the same way your application would behave in the
-  # default production environment. It's not recommended to do this for all
-  # of your scenarions, as this makes it hard to discover errors in your application.
-  ActionController::Base.allow_rescue = false
-end

data/generators/cucumber/templates/webrat_env.rb

@@ -1,22 +0,0 @@
-require 'cucumber/webrat/element_locator' # Deprecated - remove this line if you don't use #element_at or #table_at
-require 'cucumber/web/tableish'
-World(Cucumber::Tableish)
-require 'webrat'
-require 'webrat/core/matchers'
-Webrat.configure do |config|
-  config.mode = :rails
-  config.open_error_files = false # Set to true if you want error pages to pop up in the browser
-end
-
-# If you set this to true, each scenario will run in a database transaction.
-# You can still turn off transactions on a per-scenario basis, simply tagging 
-# a feature or scenario with the @no-txn tag. 
-#
-# If you set this to false, transactions will be off for all scenarios,
-# regardless of whether you use @no-txn or not.
-#
-# Beware that turning transactions off will leave data in your database 
-# after each scenario, which can lead to hard-to-debug failures in 
-# subsequent scenarios. If you do this, we recommend you create a Before
-# block that will explicitly put your database in a known state.
-Cucumber::Rails::World.use_transactional_fixtures = true