cucumber-rails 0.2.2 → 0.2.3

data/History.txt

@@ -1,3 +1,11 @@
+== 0.2.3 2010-01-03
+
+=== New Features
+* The #tableish Proc can return Strings as well as Nokogiri nodes now. (Aslak Hellesøy)
+
+=== Bugfixes
+* Handle all types of URIs in "I should be on ..." steps. (#5 Andrew D. Smith)
+
 == 0.2.2 2009-12-21
 
 === Bugfixes

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/cucumber-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cucumber-rails}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dennis Bl\303\266te", "Aslak Helles\303\270y", "Rob Holland"]
-  s.date = %q{2009-12-21}
+  s.date = %q{2010-01-03}
   s.description = %q{Cucumber Generators and Runtime for Rails}
   s.email = %q{cukes@googlegroups.com}
   s.extra_rdoc_files = [

data/generators/cucumber/templates/step_definitions/capybara_steps.rb.erb

@@ -1,5 +1,6 @@
 <%= embed_file('support/edit_warning.txt') %>
 
+require 'uri'
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
 
 module WithinHelpers
@@ -173,10 +174,11 @@ Then /^the "([^\"]*)" checkbox(?: within "([^\"]*)")? should not be checked$/ do
 end
 
 Then /^(?:|I )should be on (.+)$/ do |page_name|
+  current_path = URI.parse(current_url).select(:path, :query).compact.join('?')
   if defined?(Spec::Rails::Matchers)
-    URI.parse(current_url).path.should == path_to(page_name)
+    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
 

data/generators/cucumber/templates/step_definitions/webrat_steps.rb.erb

@@ -1,5 +1,6 @@
 <%= embed_file('support/edit_warning.txt') %>
 
+require 'uri'
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
 
 # Commonly used webrat steps
@@ -242,10 +243,11 @@ Then /^the "([^\"]*)" checkbox should not be checked$/ do |label|
 end
 
 Then /^(?:|I )should be on (.+)$/ do |page_name|
+  current_path = URI.parse(current_url).select(:path, :query).compact.join('?')
   if defined?(Spec::Rails::Matchers)
-    URI.parse(current_url).path.should == path_to(page_name)
+    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
 

data/lib/cucumber/rails/action_controller.rb

@@ -1,13 +1,40 @@
-ActionController::Base.class_eval do
-  cattr_accessor :allow_rescue
-  
-  alias_method :rescue_action_without_bypass, :rescue_action
+if Rails.version.to_f >= 3.0
+  module ActionController #:nodoc:
+    module AllowRescueException
+      extend ActiveSupport::Concern
+      include ActiveSupport::Rescuable
 
-  def rescue_action(exception)
-    if ActionController::Base.allow_rescue
-      rescue_action_without_bypass(exception)
-    else
-      raise exception
+      private
+        def process_action(*args)
+          if ActionController::Base.allow_rescue
+            super
+          else
+            begin
+              super
+            rescue Exception => exception
+              raise(exception)
+            end
+          end
+        end
+    end
+  end
+
+  ActionController::Base.class_eval do
+    cattr_accessor :allow_rescue
+    include ActionController::AllowRescueException
+  end
+else
+  ActionController::Base.class_eval do
+    cattr_accessor :allow_rescue
+    
+    alias_method :rescue_action_without_bypass, :rescue_action
+  
+    def rescue_action(exception)
+      if ActionController::Base.allow_rescue
+        rescue_action_without_bypass(exception)
+      else
+        raise exception
+      end
     end
   end
 end

data/lib/cucumber/rails/world.rb

@@ -1,14 +1,23 @@
 if defined?(ActiveRecord::Base)
   require 'test_help' 
 else
-  require 'action_controller/test_process'
-  require 'action_controller/integration'
+  # I can't do rescue LoadError because in this files could be loaded
+  # from rails gem (ie. load actionpack 2.3.5 if rubygems are not disabled)
+  if Rails.version.to_f < 3.0
+    require 'action_controller/test_process'
+    require 'action_controller/integration'
+  else
+    require 'action_dispatch/testing/test_process'
+    require 'action_dispatch/testing/integration'
+  end
 end
 
 require 'cucumber/rails/test_unit'
 require 'cucumber/rails/action_controller'
 
-if ::Rails.respond_to?(:configuration) && !(::Rails.configuration.cache_classes)
+
+if (::Rails.respond_to?(:application) && !(::Rails.application.config.cache_classes)) || 
+  (!(::Rails.respond_to?(:application)) && ::Rails.respond_to?(:configuration) && !(::Rails.configuration.cache_classes))
   warn "WARNING: You have set Rails' config.cache_classes to false (most likely in config/environments/cucumber.rb).  This setting is known to break Cucumber's use_transactional_fixtures method. Set config.cache_classes to true if you want to use transactional fixtures.  For more information see https://rspec.lighthouseapp.com/projects/16211/tickets/165."
 end
 

data/lib/cucumber/web/tableish.rb

@@ -61,7 +61,11 @@ module Cucumber
         column_count ||= cells.length
         (0...column_count).map do |n|
           cell = cells[n]
-          cell ? cell.text.strip : ''
+          case(cell)
+            when String then cell.strip
+            when nil then ''
+            else cell.text.strip
+          end
         end
       end
     end

data/spec/cucumber/web/tableish_spec.rb

@@ -123,6 +123,37 @@ module Cucumber
             %w{aslak},
           ]
         end
+
+        it "should do complex shit" do
+          html = <<-HTML
+            <form method="post" action="/invoices/10/approve" class="button-to">
+              <div>
+                <input id="approve_invoice_10" type="submit" value="Approve" />
+                <input name="authenticity_token" type="hidden" value="WxKGVy3Y5zcvFEiFe66D/odoc3CicfMdAup4vzQfiZ0=" />
+                <span>Hello&nbsp;World<span>
+              </div>
+            </form>
+            <form method="post" action="/invoices/10/delegate" class="button-to">
+              <div>
+                <input id="delegate_invoice_10" type="submit" value="Delegate" />
+                <input name="authenticity_token" type="hidden" value="WxKGVy3Y5zcvFEiFe66D/odoc3CicfMdAup4vzQfiZ0=" />
+                <span>Hi There<span>
+              </div>
+            </form>
+          HTML
+
+          selectors = lambda do |form| 
+            [
+              form.css('div input:nth-child(1)').first.attributes['value'],
+              form.css('span').first.text.gsub(/\302\240/, ' ')
+            ]
+          end
+
+          _tableish(html, 'form', selectors).should == [
+            ['Approve', "Hello World"],
+            ['Delegate', 'Hi There']
+          ]
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber-rails
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - "Dennis Bl\xC3\xB6te"
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-21 00:00:00 +01:00
+date: 2010-01-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency