watir-rails 1.2.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae7a57e6b5536cac083dfa83bffa44461bd34d0f
-  data.tar.gz: 62d7d8fcf2a10ed6ca3ea85df33cb102bcea39c3
+  metadata.gz: 20dfc23f553782527d053042e02c2e58b2661c96
+  data.tar.gz: 22654fad486f48652f1a184ece70a3d54352b444
 SHA512:
-  metadata.gz: 48e9fac9f32993daf3fa757908413deb595e66362934a91b93aa571313ceac211d4f3ff6be886e72629f6622fc3ff033a2af73be7b1afe3a00c18f76c9393f08
-  data.tar.gz: eaf0dea201e969a9fc4079fb8584abe730c9f94222902dadf02b5210557150643ad44719eab9ed998bfdcda66f392152e24f64a8087e9c3f1512536212bc26d5
+  metadata.gz: cd85bf3cf5e6a8c31d6f152f1deaece79d3519164f0bb608f9b6deb24dc57e1c0a1351651c606c7dbdf0c9142ad64bf58092510ce2a654b2ebcd9b43ac9cbbdc
+  data.tar.gz: 90a968a7118048bb196507509a8e2e089e3ed668b8a23cb3353d0908a10f4596451708971d2f558347eb872eec947fc52e67169643026d0b773a3a45d5131c0d

data/.travis.yml

@@ -1,7 +1,6 @@
 rvm:
  - 2.3.1
  - 2.2.5
- - 2.1.9
  - ruby-head
 gemfile:
   - gemfiles/Gemfile.rails-2.x

data/CHANGES.md

@@ -1,3 +1,7 @@
+### 2.0.0 - 2016/09/24
+
+* Add support for Watir 6.0.
+
 ### 1.2.1 - 2016/06/15
 
 * Fix Browser#add_checker deprecation warning. PR #18 by Christophe Bliard.

data/README.md

@@ -3,7 +3,7 @@
 [![Build Status](https://api.travis-ci.org/watir/watir-rails.png)](http://travis-ci.org/watir/watir-rails)
 [![Coverage](https://coveralls.io/repos/watir/watir-rails/badge.png?branch=master)](https://coveralls.io/r/watir/watir-rails)
 
-This gem makes the [Watir](https://github.com/watir/watir) work with Rails.
+This gem makes [Watir](https://github.com/watir/watir) work with Rails.
 
 
 ## Installation

data/Rakefile

@@ -1,9 +1,9 @@
-require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
-task :build => :spec
+task default: :spec
+task release: :spec
+require "bundler/gem_tasks"
 
 require "yard"
 YARD::Rake::YardocTask.new

data/lib/watir/rails.rb

@@ -10,7 +10,7 @@ rescue LoadError
   require "initializer"
 end
 
-require File.expand_path("browser.rb", File.dirname(__FILE__))
+require File.expand_path("rails/browser.rb", File.dirname(__FILE__))
 require File.expand_path("rails/middleware.rb", File.dirname(__FILE__))
 
 module Watir
@@ -33,8 +33,8 @@ module Watir
 
           Timeout.timeout(boot_timeout) { @server_thread.join(0.1) until running? }
         end
-      rescue TimeoutError
-        raise TimeoutError, "Rails Rack application timed out during boot"
+      rescue Timeout::Error
+        raise Timeout::Error, "Rails Rack application timed out during boot"
       end
 
       # Host for Rails app under test. Default is {.local_host}.

data/lib/watir/rails/browser.rb

@@ -0,0 +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
+

data/lib/watir/version.rb

@@ -1,5 +1,5 @@
 module Watir
   class Rails
-    VERSION = "1.2.1"
+    VERSION = "2.0.0"
   end
 end

data/spec/support/watir.rb

@@ -3,7 +3,9 @@
 module Watir
   class Browser
     def initialize(*args)
-      require File.expand_path("fake_browser_with_goto", File.dirname(__FILE__))
+    end
+
+    def goto(url)
     end
   end
 end

data/spec/watir/{browser_spec.rb → rails/browser_spec.rb}

@@ -6,22 +6,22 @@ describe Watir::Browser do
   context "#initialize" do
     it "starts Rails before opening the browser" do
       expect(Watir::Rails).to receive(:boot)
-      expect_any_instance_of(Watir::Browser).to receive(:original_initialize).and_call_original
+      expect_any_instance_of(Watir::Browser).to receive(:_original_initialize).and_call_original
 
       Watir::Browser.new
     end
 
-    it "does not add Exception checker when exceptions are ignored" do
+    it "does not add Exception hook when exceptions are ignored" do
       allow(Watir::Rails).to receive_messages(ignore_exceptions?: true, boot: nil)
 
-      expect_any_instance_of(Watir::Browser).not_to receive(:add_exception_checker)
+      expect_any_instance_of(Watir::Browser).not_to receive(:add_exception_hook)
       Watir::Browser.new
     end
 
-    it "adds Exception checker when exceptions are not ignored" do
+    it "adds Exception hook when exceptions are not ignored" do
       allow(Watir::Rails).to receive_messages(ignore_exceptions?: false, boot: nil)
 
-      expect_any_instance_of(Watir::Browser).to receive(:add_exception_checker)
+      expect_any_instance_of(Watir::Browser).to receive(:add_exception_hook)
       Watir::Browser.new
     end
   end
@@ -34,32 +34,32 @@ describe Watir::Browser do
     let(:browser) { Watir::Browser.new }
 
     it "uses Rails for paths specified as an url" do
-      expect(browser).to receive(:_new_goto).with("http://foo.com:42/foo/bar")
+      expect(browser).to receive(:_original_goto).with("http://foo.com:42/foo/bar")
       browser.goto("/foo/bar")
     end
 
     it "does not alter url with http:// scheme" do
-      expect(browser).to receive(:_new_goto).with("http://baz.org/lol")
+      expect(browser).to receive(:_original_goto).with("http://baz.org/lol")
       browser.goto("http://baz.org/lol")
     end
 
     it "does not alter url with https:// scheme" do
-      expect(browser).to receive(:_new_goto).with("https://baz.org/lol")
+      expect(browser).to receive(:_original_goto).with("https://baz.org/lol")
       browser.goto("https://baz.org/lol")
     end
 
     it "does not alter about:urls" do
-      expect(browser).to receive(:_new_goto).with("about:url")
+      expect(browser).to receive(:_original_goto).with("about:url")
       browser.goto("about:url")
     end
 
     it "does not alter data:urls" do
-      expect(browser).to receive(:_new_goto).with("data:url")
+      expect(browser).to receive(:_original_goto).with("data:url")
       browser.goto("data:url")
     end
 
     it "alters the unknown urls" do
-      expect(browser).to receive(:_new_goto).with("http://foo.com:42/xxx:yyy")
+      expect(browser).to receive(:_original_goto).with("http://foo.com:42/xxx:yyy")
       browser.goto("http://foo.com:42/xxx:yyy")
     end
   end

data/watir-rails.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "rack"
   gem.add_dependency "rails"
-  gem.add_dependency "watir", "~> 5.0"
+  gem.add_dependency "watir", ">= 6.0.0.beta4"
 
   gem.add_development_dependency "yard"
   gem.add_development_dependency "redcarpet"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watir-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Jarmo Pertman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-15 00:00:00.000000000 Z
+date: 2016-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -42,16 +42,16 @@ dependencies:
   name: watir
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 6.0.0.beta4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 6.0.0.beta4
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -111,14 +111,13 @@ files:
 - Rakefile
 - gemfiles/Gemfile.rails-2.x
 - gemfiles/Gemfile.rails-3.x
-- lib/watir/browser.rb
 - lib/watir/rails.rb
+- lib/watir/rails/browser.rb
 - lib/watir/rails/middleware.rb
 - lib/watir/version.rb
 - spec/spec_helper.rb
-- spec/support/fake_browser_with_goto.rb
 - spec/support/watir.rb
-- spec/watir/browser_spec.rb
+- spec/watir/rails/browser_spec.rb
 - spec/watir/rails/middleware_spec.rb
 - spec/watir/rails_spec.rb
 - watir-rails.gemspec
@@ -142,15 +141,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Use Watir (http://github.com/watir/watir) in Rails.
 test_files:
 - spec/spec_helper.rb
-- spec/support/fake_browser_with_goto.rb
 - spec/support/watir.rb
-- spec/watir/browser_spec.rb
+- spec/watir/rails/browser_spec.rb
 - spec/watir/rails/middleware_spec.rb
 - spec/watir/rails_spec.rb
 has_rdoc: 

data/lib/watir/browser.rb

@@ -1,67 +0,0 @@
-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)
-      initialize_rails_with_watir *args
-    end
-
-    # 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
-      _new_goto url
-    end
-
-    private
-
-    def override_and_preserve_original_methods(*method_names, &block)
-      method_names.each do |method_name|
-        next if respond_to? "_original_#{method_name}", true
-        self.class.send :alias_method, "_original_#{method_name}", method_name
-      end
-
-      result = block.call
-
-      method_names.each do |method_name|
-        next if respond_to? "_new_#{method_name}", true
-        self.class.send :alias_method, "_new_#{method_name}", method_name
-
-        self.class.send :define_method, method_name do |*args|
-          send("_original_#{method_name}", *args)
-          #send("_new_#{method_name}", *args)
-        end
-      end
-
-      result
-    end
-
-    def initialize_rails_with_watir(*args)
-      Rails.boot
-      override_and_preserve_original_methods(:goto) { original_initialize *args }
-      add_exception_checker unless Rails.ignore_exceptions?
-    end
-
-    def add_exception_checker
-      after_hooks.add do
-        if error = Rails.error
-          Rails.error = nil
-          raise error
-        end
-      end
-    end
-  end
-end
-

data/spec/support/fake_browser_with_goto.rb

@@ -1,8 +0,0 @@
-# Needed to simulate watir driver's gem (watir-webdriver or watir-classic).
-
-module Watir
-  class Browser
-    def goto(*args)
-    end
-  end
-end