watir-rails 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0c25008ecb45a81911ea6ba65a5c57f0a9c381a
-  data.tar.gz: f76ae19a59348678dff5f244f737314b030ba683
+  metadata.gz: c5f55b4c34351f604ba80f5ce9d8cf3671f1adb8
+  data.tar.gz: 96797851b1429d45a2b9412bf27709f1a196c8e4
 SHA512:
-  metadata.gz: 4d4a6ba9c78ee9560479821255aaccf78c107d43bd92cf9103c88e24681712547de132018c67be09b6c2e7b38a521e494dd63d413272a17aca06d4026be765b7
-  data.tar.gz: 6c84d744731793d71d4ede37632de7e08474f5f024683860cbca4a007769a3201cbeb373feeb327375f6e92b644844f442f572fde4d8cc48fa88df603a665b46
+  metadata.gz: 5a315b5a51eb5a2a5aeb0303797aec1028667a9d64e6cb9dc6d71ceb143f6f04f2efe71ada441d1423abadb0d41d9b2fcab6ad19f88f3bb7fa228b36c57bb6fc
+  data.tar.gz: 2dbefb973b573af3da48e3fed23dd11e69b5733ae2852e828b72d37dc4c2fa36e06089ede3f41f022f29d569710d9408dada719ea4e4e75b0e08d2782108014d

data/README.md

@@ -2,27 +2,40 @@
 
 This gem adds the [Watir](http://github.com/watir/watir) usage support when writing integration tests in Rails.
 
+
 ## Installation
 
 Add this code to your Gemfile:
 
-````ruby
+```ruby
 group :test do
   gem 'watir-rails'
 end
-````
+```
 
 ## Usage
 
 Just use Watir like you've always done in your requests/integration tests:
 
-````ruby
+```ruby
 browser = Watir::Browser.new
 browser.goto home_path
 browser.text_field(name: "first").set "Jarmo"
 browser.text_field(name: "last").set  "Pertman"
 browser.button(name: "sign_in").click
-````
+```
+
+### Ignore Rails Exceptions
+
+By default, exceptions raised by Rails application will be re-raised in your tests making them to fail.
+
+This feature is only enabled when `config.action_dispatch.show_exceptions` is set to `false` in your Rails configuration.
+
+You can disable it in watir-rails by ignoring exceptions:
+
+```ruby
+Watir::Rails.ignore_exceptions = false
+```
 
 ## Limitations
 
@@ -33,6 +46,13 @@ The problem is probably caused by the fact that [WIN32OLE overwrites Thread#init
 
 * When using Rails path/url helpers in your tests then always use path instead of url methods, because latter won't work!
 
+
+## Contributors
+
+* [Jarmo Pertman](https://github.com/jarmo)
+* [Alex Rodionov](https://github.com/p0deje)
+
+
 ## License
 
 See [LICENSE](https://github.com/watir/watir-rails/blob/master/LICENSE).

data/lib/watir/browser.rb

@@ -9,6 +9,7 @@ module Watir
     def initialize(*args)
       Rails.boot
       original_initialize *args
+      add_checker { raise Rails.error if Rails.error } unless Rails.ignore_exceptions?
     end
 
     # @private
@@ -25,7 +26,7 @@ module Watir
     #
     # @param [String] url URL to be navigated to.
     def goto(url)
-      url = "http://#{Rails.host}:#{Rails.port}#{url}" unless url =~ %r{^https?://}i || url == "about:blank"
+      url = "http://#{Rails.host}:#{Rails.port}#{url}" unless url =~ %r{^(about|data|https?):}i
       original_goto url
     end
   end

data/lib/watir/rails.rb

@@ -3,27 +3,14 @@ require 'net/http'
 require 'rack'
 require 'watir-webdriver'
 require File.expand_path("browser.rb", File.dirname(__FILE__))
+require File.expand_path("rails/middleware.rb", File.dirname(__FILE__))
 
 module Watir
   class Rails
-    # @private
-    class Middleware
-      def initialize(app)
-        @app = app
-      end
-
-      def call(env)
-        if env["PATH_INFO"] == "/__identify__"
-          [200, {}, [@app.object_id.to_s]]
-        else
-          @app.call(env)
-        end
-      end
-    end
-
     class << self
       private :new
       attr_reader :port, :middleware
+      attr_writer :ignore_exceptions
 
       # Start the Rails server for tests.
       # Will be called automatically by {Watir::Browser#initialize}.
@@ -39,7 +26,7 @@ module Watir
           Timeout.timeout(60) { @server_thread.join(0.1) until running? }
         end
       rescue TimeoutError
-        raise "Rack application timed out during boot"
+        raise "Rails Rack application timed out during boot"
       end
 
       # Host for Rails app under test. When not set via {.host=} then
@@ -64,6 +51,33 @@ module Watir
         "127.0.0.1"
       end
 
+      # Error rescued by the middleware.
+      #
+      # @return [Exception or NilClass]
+      def error
+        @middleware.error
+      end
+
+      # Check if Rails exceptions should be ignored. Defaults to false.
+      #
+      # @return [Boolean] true if exceptions should be ignored, false otherwise.
+      def ignore_exceptions?
+        unless @ignore_exceptions
+          show = if legacy_rails?
+                   ::Rails.configuration.action_dispatch.show_exceptions
+                 else
+                   ::Rails.application.config.action_dispatch.show_exceptions
+                 end
+
+          if show
+            warn '[WARN] "action_dispatch.show_exceptions" is set to "true", disabling watir-rails exception catcher.'
+            @ignore_exceptions = false
+          end
+        end
+
+        !!@ignore_exceptions
+      end
+
       # Check if Rails app under test is running.
       #
       # @return [Boolean] true when Rails app under test is running, false otherwise.
@@ -83,13 +97,14 @@ module Watir
       #
       # @return [Object] Rails Rack app.
       def app
+        legacy = legacy_rails?
         @app ||= Rack::Builder.new do
           map "/" do
-            if ::Rails.version.to_f >= 3.0
-              run ::Rails.application  
-            else # Rails 2
+            if legacy
               use ::Rails::Rack::Static
               run ActionController::Dispatcher.new
+            else
+              run ::Rails.application
             end
           end
         end.to_app
@@ -115,6 +130,10 @@ module Watir
         end
       end
 
+      def legacy_rails?
+        ::Rails.version.to_f < 3.0
+      end
+
     end
   end
 end

data/lib/watir/rails/middleware.rb

@@ -0,0 +1,25 @@
+module Watir
+  class Rails
+    # @private
+    class Middleware
+      attr_reader :error
+
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        if env["PATH_INFO"] == "/__identify__"
+          [200, {}, [@app.object_id.to_s]]
+        else
+          begin
+            @app.call(env)
+          rescue => e
+            @error = e
+          end
+        end
+      end
+    end
+
+  end
+end

data/lib/watir/version.rb

@@ -1,5 +1,5 @@
-module Watir
-  class Rails
-    VERSION = "0.0.3"
-  end
-end
+module Watir
+  class Rails
+    VERSION = "0.1.0"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watir-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Jarmo Pertman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-05 00:00:00.000000000 Z
+date: 2013-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -95,6 +95,7 @@ files:
 - Rakefile
 - lib/watir/browser.rb
 - lib/watir/rails.rb
+- lib/watir/rails/middleware.rb
 - lib/watir/version.rb
 - watir-rails.gemspec
 homepage: http://github.com/watir/watir-rails