tarantula 0.5.0 → 0.5.1

data/CHANGELOG

@@ -1,3 +1,6 @@
+v0.5.1
+* Rescue exceptions for Rails 3 integration tests and return them as 404/500 responses.
+
 v0.5.0
 * Handle rails 3.2 link methods
 * Renamed Relevance::Tarantula::Link#method to #meth

data/ci/rails2.gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source "https://rubygems.org"
 
 gemspec :path => "../"
 gem 'rails', '~> 2.3.14', :group => :development

data/ci/rails3.gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source "https://rubygems.org"
 
 gemspec :path => "../"
 gem 'rails', '~> 3.2.13', :group => :development

data/lib/relevance/tarantula/rails_integration_proxy.rb

@@ -11,8 +11,8 @@ module Relevance
 
       def self.rails_integration_test(integration_test, options = {})
         t = Crawler.new
-        t.max_url_length = options[:max_url_length] if options[:max_url_length] 
-        t.proxy = RailsIntegrationProxy.new(integration_test)    
+        t.max_url_length = options[:max_url_length] if options[:max_url_length]
+        t.proxy = RailsIntegrationProxy.new(integration_test)
         t.handlers << HtmlDocumentHandler.new(t)
         t.handlers << InvalidHtmlHandler.new
         t.log_grabber = Relevance::Tarantula::LogGrabber.new(File.join(rails_root, "log/test.log"))
@@ -33,22 +33,36 @@ module Relevance
 
       [:get, :post, :put, :delete].each do |verb|
         define_method(verb) do |url, *args|
-          integration_test.send(verb, url, *args)
-          response = integration_test.response
+          response = nil
+          begin
+            integration_test.send(verb, url, *args)
+            response = integration_test.response
+          rescue *error_classes => e
+            response = integration_test.response
+            alter_response(response, '404', e.message + "\n\n" + e.backtrace.join("\n"))
+          rescue Exception => e
+            response = integration_test.response
+            alter_response(response, '500', e.message + "\n\n" + e.backtrace.join("\n"))
+          end
           patch_response(url, response)
           response
         end
       end
 
+      def alter_response(response, code, body)
+        response.meta.attr_accessor :code
+        response.code = code
+        response.body = body
+        response
+      end
+
       def patch_response(url, response)
         if response.code == '404'
           if File.exist?(static_content_path(url))
             case ext = File.extension(url)
             when /html|te?xt|css|js|jpe?g|gif|psd|png|eps|pdf|ico/
-              response.body = static_content_file(url)
               response.headers["type"] = "text/#{ext}"  # readable as response.content_type
-              response.meta.attr_accessor :code
-              response.code = "200"
+              alter_response(response, '200', static_content_file(url))
             else
               log "Skipping unknown type #{url}"
             end
@@ -61,6 +75,7 @@ module Relevance
         end
       end
 
+
       def static_content_file(url)
         File.read(static_content_path(url))
       end
@@ -68,6 +83,14 @@ module Relevance
       def static_content_path(url)
         File.expand_path(File.join(rails_root, "public", url))
       end
+
+      private
+      def error_classes
+        defined?(ActionController::RoutingError) ?
+          [ActiveRecord::RecordNotFound, ActionController::RoutingError] :
+          [ActiveRecord::RecordNotFound]
+      end
+
     end
 
   end

data/lib/relevance/tarantula/version.rb

@@ -1,5 +1,5 @@
 module Relevance
   module Tarantula
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
   end
 end

data/spec/relevance/tarantula/rails_integration_proxy_spec.rb

@@ -43,7 +43,19 @@ describe "Relevance::Tarantula::RailsIntegrationProxy" do
     Relevance::Tarantula::RailsIntegrationProxy.new(o)
     o.methods(false).map(&:to_s).sort.should == %w{response response=}
   end
+end
 
+describe "Relevance::Tarantula::RailsIntegrationProxy errors" do
+  it "alters response to contain the error message" do
+    @rip = Relevance::Tarantula::RailsIntegrationProxy.new(stub)
+    @response = Struct.new(:body, :code).new(nil, nil)
+    @rip.integration_test = stub_everything(:response => @response) do |stub|
+      stub.stubs(:get).raises(Exception, 'Internal Server Error')
+    end
+    response = @rip.get("/url")
+    response.code.should == '500'
+    response.body.should =~ /\AInternal Server Error\n\n/
+  end
 end
 
 describe "Relevance::Tarantula::RailsIntegrationProxy patching" do

metadata

@@ -1,144 +1,136 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: tarantula
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 0.5.1
   prerelease: 
-  segments: 
-  - 0
-  - 5
-  - 0
-  version: 0.5.0
 platform: ruby
-authors: 
+authors:
 - Relevance, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-04-12 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-05-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: htmlentities
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.3.0
   type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 51
-        segments: 
-        - 4
-        - 3
-        - 0
+      - !ruby/object:Gem::Version
         version: 4.3.0
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: hpricot
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.4
   type: :runtime
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 0
-        - 8
-        - 4
+      - !ruby/object:Gem::Version
         version: 0.8.4
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.0
   type: :development
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 2
-        - 12
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.12.0
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: rdoc
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.12.0
   type: :development
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 3
-        - 12
-        - 0
+      - !ruby/object:Gem::Version
         version: 3.12.0
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: log_buddy
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
   type: :development
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.6.0
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: mocha
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.13.2
   type: :development
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 0
-        - 13
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.13.2
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.0
   type: :development
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.0
-  requirement: *id007
-description: Tarantula is a big fuzzy spider. It crawls your Rails 2.3 and 3.x applications, fuzzing data to see what breaks.
-email: 
+description: Tarantula is a big fuzzy spider. It crawls your Rails 2.3 and 3.x applications,
+  fuzzing data to see what breaks.
+email:
 - opensource@thinkrelevance.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .autotest
 - .gitignore
 - .rvmrc
@@ -229,36 +221,33 @@ files:
 - vendor/xss-shield/test/test_safe_string.rb
 homepage: https://github.com/relevance/tarantula
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3645130857833541584
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -3645130857833541584
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A big hairy fuzzy spider that crawls your site, wreaking havoc
-test_files: 
+test_files:
 - template/tarantula_test.rb