watir-rails 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70a4bf116e756c213c309ccd099175324a364a69bdf3e9e7b43889b2430220b3
-  data.tar.gz: 5debf047f4f0fef4474bc81b712dc47f085cc14989e4ae068bab2283f6cfb655
+  metadata.gz: f3f4596aba0f22d5d0b00aeeb2bcb5b27235b573675eef6b34e41b1bdfca8592
+  data.tar.gz: 7e60e1cf800f2e2603566d81c25fa946c674903b6550594142c3ad8feca17d57
 SHA512:
-  metadata.gz: 28658a949209812b349e100afcf9a7d7850a09080f1bd23b4e784a9250b8a1c21c04f37d9cdccfeb07e60c0a13b095e3a3727ab3c99246ae433509d105ddd5ea
-  data.tar.gz: 7f2f3901a136c79515f2a323e95c302898db125ab478ffcb13b81069eafcddbe4e40d1b5462f2b48508d132415c58267a92dae0210e608e81ed410d1f8b0c14f
+  metadata.gz: 7f92b51730934fa6dfa1726413802d5a358f93583263f2a65099075f3c4c06e959d75c0449365a6040e48b7f29618046bea46ab79ee361e535bc99d5eb5e0925
+  data.tar.gz: b250aa4862442974c4b1d8b0af79206deaeb9c94ac2f901c70ed4ce8a281101e8ff0f727e63d8b107c82b5092c2590e8971f39f3cbe1d757d2b948da8840ed92

data/CHANGES.md

@@ -1,3 +1,7 @@
+### 2.4.0 - 2025/10/03
+
+* Support Webrick for Ruby 3.0+. PR #37 by Norbert Szivós.
+
 ### 2.3.0 - 2023/02/18
 
 * Make `Watir::Rails.boot` use previously selected port in subsequent calls. PR #34 by Bartek Bulat.

data/lib/watir/rails/browser.rb

@@ -1,45 +1,45 @@
-module Watir
-  # Reopened Watir::Browser class for working with Rails
-  class Browser
-    # @private
-    alias_method :_original_initialize, :initialize
-
-    # Will start Rails instance for Watir automatically and then invoke the
-    # original Watir::Browser#initialize method.
-    def initialize(*args)
-      Rails.boot
-      _original_initialize *args
-      add_exception_hook unless Rails.ignore_exceptions?
-    end
-
-    # @private
-    alias_method :_original_goto, :goto
-
-    # Opens the url with the browser instance.
-    # Will add {Rails.host} and {Rails.port} to the url when path is specified.
-    #
-    # @example Go to the regular url:
-    #   browser.goto "http://google.com"
-    #
-    # @example Go to the controller path:
-    #   browser.goto home_path
-    #
-    # @param [String] url URL to be navigated to.
-    def goto(url)
-      url = "http://#{Rails.host}:#{Rails.port}#{url}" unless url =~ %r{^(about|data|https?):}i
-      _original_goto url
-    end
-
-    private
-
-    def add_exception_hook
-      after_hooks.add do
-        if error = Rails.error
-          Rails.error = nil
-          raise error
-        end
-      end
-    end
-  end
-end
-
+module Watir
+  # Reopened Watir::Browser class for working with Rails
+  class Browser
+    # @private
+    alias_method :_original_initialize, :initialize
+
+    # Will start Rails instance for Watir automatically and then invoke the
+    # original Watir::Browser#initialize method.
+    def initialize(*args)
+      Rails.boot
+      _original_initialize *args
+      add_exception_hook unless Rails.ignore_exceptions?
+    end
+
+    # @private
+    alias_method :_original_goto, :goto
+
+    # Opens the url with the browser instance.
+    # Will add {Rails.host} and {Rails.port} to the url when path is specified.
+    #
+    # @example Go to the regular url:
+    #   browser.goto "http://google.com"
+    #
+    # @example Go to the controller path:
+    #   browser.goto home_path
+    #
+    # @param [String] url URL to be navigated to.
+    def goto(url)
+      url = "http://#{Rails.host}:#{Rails.port}#{url}" unless url =~ %r{^(about|data|https?):}i
+      _original_goto url
+    end
+
+    private
+
+    def add_exception_hook
+      after_hooks.add do
+        if error = Rails.error
+          Rails.error = nil
+          raise error
+        end
+      end
+    end
+  end
+end
+

data/lib/watir/rails/version.rb

@@ -1,5 +1,5 @@
 module Watir
   class Rails
-    VERSION = "2.3.0"
+    VERSION = "2.4.0"
   end
 end

data/lib/watir/rails.rb

@@ -146,8 +146,14 @@ module Watir
           rescue LoadError
           end
 
-          require 'rack/handler/webrick'
-          Rack::Handler::WEBrick.run(app, :Port => port, :AccessLog => [], :Logger => WEBrick::Log::new(nil, 0))
+          begin
+            require 'rack/handler/webrick'
+            return Rack::Handler::WEBrick.run(app, :Port => port, :AccessLog => [], :Logger => WEBrick::Log::new(nil, 0))
+          rescue LoadError
+          end
+
+          require 'rackup/handler/webrick'
+          Rackup::Handler::WEBrick.run(app, :Port => port, :AccessLog => [], :Logger => WEBrick::Log::new(nil, 0))
         end
       end
     end

data/spec/support/watir.rb

@@ -1,11 +1,11 @@
-# Needed to simulate watir gem.
-
-module Watir
-  class Browser
-    def initialize(*args)
-    end
-
-    def goto(url)
-    end
-  end
-end
+# Needed to simulate watir gem.
+
+module Watir
+  class Browser
+    def initialize(*args)
+    end
+
+    def goto(url)
+    end
+  end
+end

data/watir-rails.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "yard"
   gem.add_development_dependency "redcarpet"
   gem.add_development_dependency "rspec", "~> 3.0"
+  gem.add_development_dependency "webrick"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watir-rails
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Jarmo Pertman
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-18 00:00:00.000000000 Z
+date: 2025-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Use Watir (http://github.com/watir/watir) in Rails.
 email:
 - jarmo.p@gmail.com
@@ -126,7 +140,7 @@ homepage: http://github.com/watir/watir-rails
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -141,8 +155,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.25
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Use Watir (http://github.com/watir/watir) in Rails.
 test_files: