watir-rails 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b32693f90099aad27d5da3471f0d8d01bd6b3172
-  data.tar.gz: 6a5844920d2d62a7ff57fda7717ef75ef3cd0367
+  metadata.gz: 0f8abf0d7e9d327caf7fa3e7c5a21d13dac8f47c
+  data.tar.gz: b90e0a98b4296d0f740d6fd69c946ed9097f188b
 SHA512:
-  metadata.gz: f2892944f90aba0a3ca2f49d094d8cbc5bc6bf666a0be9ac61ed4d47af611ae197cf17bad082ffad37f0e1a9bc6faa940dd902c508c451825a6d1c00faf7f31f
-  data.tar.gz: 96b4b68e46419b5d3226e0e67ce85c257793600536f2f995dc4e9c3bd4c474fa554608389ea4540b35543c7e274ce6214de4267d72a7a5a285e4f37fa2ea4158
+  metadata.gz: 903bacfd1d2c8409a8c43f3d2e4882aa996e2d046f3039b0264f9b9e05d2bb893d941f86820be2caacc93b69e27a89db5cbe6de039a8e760d84566b6d6f35bae
+  data.tar.gz: 46ac28987d1dfe385bf3d7a185a2da6c86eadf6a42c2578edf2489f08e3155196524642f5413592cfc1e55ea6a1f04877054082fdd3820072fcd4c78f4b261f1

data/.travis.yml

@@ -1,15 +1,16 @@
-rvm:
- - 2.2.0
- - 2.0.0
- - ruby-head
-gemfile:
-  - gemfiles/Gemfile.rails-2.x
-  - gemfiles/Gemfile.rails-3.x
-  - Gemfile
-notifications:
-  recipients:
-    - jarmo.p@gmail.com
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-
+rvm:
+ - 2.2.1
+ - 2.1.5
+ - 2.0.0
+ - ruby-head
+gemfile:
+  - gemfiles/Gemfile.rails-2.x
+  - gemfiles/Gemfile.rails-3.x
+  - Gemfile
+notifications:
+  recipients:
+    - jarmo.p@gmail.com
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+

data/.yardopts

@@ -1,6 +1,6 @@
---readme README.md
---no-private
---hide-void-return
---title "Watir-Rails"
---files LICENSE
---default-return ""
+--readme README.md
+--no-private
+--hide-void-return
+--title "Watir-Rails"
+--files LICENSE
+--default-return ""

data/CHANGES.md

@@ -1,3 +1,7 @@
+### 1.1.0 - 2015/07/22
+
+* Remove strict `mime-types` dependency. See #13
+
 ### 1.0.4 - 2015/02/28
 
 * Allow to set Watir::Rails.ignore_exceptions to false. PR #8 by Andrey Koleshko.

data/README.md

@@ -1,56 +1,56 @@
-# Watir::Rails
-[![Gem Version](https://badge.fury.io/rb/watir-rails.png)](http://badge.fury.io/rb/watir-rails)
-[![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.
-
-
-## Installation
-
-Add this code to your Gemfile:
-
-```ruby
-group :test do
-  gem "watir-rails"
-end
-```
-
-## Usage
-
-Just use Watir like you've always done in your requests/integration tests:
-
-```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 = true
-```
-
-## Limitations
-
-* 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).
+# Watir::Rails
+[![Gem Version](https://badge.fury.io/rb/watir-rails.png)](http://badge.fury.io/rb/watir-rails)
+[![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.
+
+
+## Installation
+
+Add this code to your Gemfile:
+
+```ruby
+group :test do
+  gem "watir-rails"
+end
+```
+
+## Usage
+
+Just use Watir like you've always done in your requests/integration tests:
+
+```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 = true
+```
+
+## Limitations
+
+* 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/version.rb

@@ -1,5 +1,5 @@
 module Watir
   class Rails
-    VERSION = "1.0.4"
+    VERSION = "1.1.0"
   end
 end

data/spec/spec_helper.rb

@@ -1,15 +1,15 @@
-require "simplecov"
-require 'coveralls'
-
-SimpleCov.formatter = Coveralls::SimpleCov::Formatter
-SimpleCov.start
-
-# Make sure that fake watir gems are loaded for specs.
-$LOAD_PATH.unshift File.expand_path("support", File.dirname(__FILE__))
-
-require "watir/rails"
-
-RSpec.configure do |c|
-  c.color = true
-  c.order = :random
-end
+require "simplecov"
+require 'coveralls'
+
+SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+SimpleCov.start
+
+# Make sure that fake watir gems are loaded for specs.
+$LOAD_PATH.unshift File.expand_path("support", File.dirname(__FILE__))
+
+require "watir/rails"
+
+RSpec.configure do |c|
+  c.color = true
+  c.order = :random
+end

data/spec/watir/browser_spec.rb

@@ -1,66 +1,66 @@
-require "spec_helper"
-
-describe Watir::Browser do
-  before { Watir::Rails.stub(ignore_exceptions?: true) }
-
-  context "#initialize" do
-    it "starts Rails before opening the browser" do
-      Watir::Rails.should_receive(:boot)
-      Watir::Browser.any_instance.should_receive(:original_initialize).and_call_original
-
-      Watir::Browser.new
-    end
-
-    it "does not add Exception checker when exceptions are ignored" do
-      Watir::Rails.stub(ignore_exceptions?: true, boot: nil)
-
-      Watir::Browser.any_instance.should_not_receive(:add_exception_checker)
-      Watir::Browser.new
-    end
-
-    it "adds Exception checker when exceptions are not ignored" do
-      Watir::Rails.stub(ignore_exceptions?: false, boot: nil)
-
-      Watir::Browser.any_instance.should_receive(:add_exception_checker)
-      Watir::Browser.new
-    end
-  end
-
-  context "#goto" do
-    before do
-      Watir::Rails.stub(host: "foo.com", port: 42, boot: nil)
-    end
-
-    let(:browser) { Watir::Browser.new }
-
-    it "uses Rails for paths specified as an url" do
-      browser.should_receive(:_new_goto).with("http://foo.com:42/foo/bar")
-      browser.goto("/foo/bar")
-    end
-
-    it "does not alter url with http:// scheme" do
-      browser.should_receive(:_new_goto).with("http://baz.org/lol")
-      browser.goto("http://baz.org/lol")
-    end
-
-    it "does not alter url with https:// scheme" do
-      browser.should_receive(:_new_goto).with("https://baz.org/lol")
-      browser.goto("https://baz.org/lol")
-    end
-
-    it "does not alter about:urls" do
-      browser.should_receive(:_new_goto).with("about:url")
-      browser.goto("about:url")
-    end
-
-    it "does not alter data:urls" do
-      browser.should_receive(:_new_goto).with("data:url")
-      browser.goto("data:url")
-    end
-
-    it "alters the unknown urls" do
-      browser.should_receive(:_new_goto).with("http://foo.com:42/xxx:yyy")
-      browser.goto("http://foo.com:42/xxx:yyy")
-    end
-  end
-end
+require "spec_helper"
+
+describe Watir::Browser do
+  before { allow(Watir::Rails).to receive_messages(ignore_exceptions?: true) }
+
+  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
+
+      Watir::Browser.new
+    end
+
+    it "does not add Exception checker 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)
+      Watir::Browser.new
+    end
+
+    it "adds Exception checker 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)
+      Watir::Browser.new
+    end
+  end
+
+  context "#goto" do
+    before do
+      allow(Watir::Rails).to receive_messages(host: "foo.com", port: 42, boot: nil)
+    end
+
+    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")
+      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")
+      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")
+      browser.goto("https://baz.org/lol")
+    end
+
+    it "does not alter about:urls" do
+      expect(browser).to receive(:_new_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")
+      browser.goto("data:url")
+    end
+
+    it "alters the unknown urls" do
+      expect(browser).to receive(:_new_goto).with("http://foo.com:42/xxx:yyy")
+      browser.goto("http://foo.com:42/xxx:yyy")
+    end
+  end
+end

data/spec/watir/rails/middleware_spec.rb

@@ -1,30 +1,30 @@
-require "spec_helper"
-
-describe Watir::Rails::Middleware do
-  let(:app) { double("app") }
-  let(:middleware) { described_class.new app }
-
-  context "#call" do
-    it "/__identify__ returns app id" do
-      app.should_not_receive(:call)
-      middleware.call("PATH_INFO" => "/__identify__").should == [200, {}, [app.object_id.to_s]]
-    end
-
-    it "other requests are forwarded to the app" do
-      env = {}
-      app.should_receive(:call).with(env)
-      middleware.call(env)
-    end
-
-    it "errors are stored and re-raised" do
-      error = RuntimeError.new
-      app.stub(:call).and_raise error
-
-      expect {
-        middleware.call({})
-      }.to raise_error(error)
-
-      middleware.error.should == error
-    end
-  end
-end
+require "spec_helper"
+
+describe Watir::Rails::Middleware do
+  let(:app) { double("app") }
+  let(:middleware) { described_class.new app }
+
+  context "#call" do
+    it "/__identify__ returns app id" do
+      expect(app).not_to receive(:call)
+      expect(middleware.call("PATH_INFO" => "/__identify__")).to eq([200, {}, [app.object_id.to_s]])
+    end
+
+    it "other requests are forwarded to the app" do
+      env = {}
+      expect(app).to receive(:call).with(env)
+      middleware.call(env)
+    end
+
+    it "errors are stored and re-raised" do
+      error = RuntimeError.new
+      allow(app).to receive(:call).and_raise error
+
+      expect {
+        middleware.call({})
+      }.to raise_error(error)
+
+      expect(middleware.error).to eq(error)
+    end
+  end
+end

data/spec/watir/rails_spec.rb

@@ -2,92 +2,102 @@ require "spec_helper"
 
 describe Watir::Rails do
   before do
-    described_class.stub(:warn)
+    allow(described_class).to receive(:warn)
     described_class.ignore_exceptions = nil
     described_class.instance_eval { @middleware = @port = @server_thread = @host = @app = nil }
   end
 
   context ".boot" do
     it "starts the server unless already running" do
-      described_class.stub(app: double("app"), find_available_port: 42)
-      described_class.should_receive(:running?).twice.and_return(false, true)
-      described_class.should_receive(:run_default_server).once
+      allow(described_class).to receive_messages(app: double("app"), find_available_port: 42)
+      expect(described_class).to receive(:running?).twice.and_return(false, true)
+      expect(described_class).to receive(:run_default_server).once
 
       described_class.boot
+      wait_until_server_started
     end
 
     it "does nothing if server is already running" do
-      described_class.stub(app: double("app"), find_available_port: 42)
-      described_class.should_receive(:running?).once.and_return(true)
-      described_class.should_not_receive(:run_default_server)
+      allow(described_class).to receive_messages(app: double("app"), find_available_port: 42)
+      expect(described_class).to receive(:running?).once.and_return(true)
+      expect(described_class).not_to receive(:run_default_server)
 
       described_class.boot
     end
 
     it "raises an error if Rails won't boot with timeout" do
-      described_class.stub(app: double("app"), find_available_port: 42, boot_timeout: 0.01)
-      described_class.should_receive(:running?).at_least(:twice).and_return(false)
-      described_class.should_receive(:run_default_server)
+      allow(described_class).to receive_messages(app: double("app"),
+        find_available_port: 42, boot_timeout: 0.01)
+      expect(described_class).to receive(:running?).at_least(:twice).and_return(false)
+      expect(described_class).to receive(:run_default_server)
 
       expect {
         described_class.boot
       }.to raise_error(Timeout::Error)
     end
+
+    def wait_until_server_started
+      Timeout.timeout(10) { sleep 0.1 while described_class.instance_variable_get(:@server_thread).alive? }
+    end
   end
 
   context ".host" do
     it "@host if specified" do
       described_class.host = "my_host"
-      described_class.host.should == "my_host"
+      expect(described_class.host).to eq("my_host")
     end
 
     it "local_host if @host is not specified" do
       described_class.host = nil
-      described_class.host.should == "127.0.0.1"
+      expect(described_class.host).to eq("127.0.0.1")
     end
   end
 
   context ".ignore_exceptions?" do
     it "true if @ignore_exceptions is set to true" do
       described_class.ignore_exceptions = true
-      described_class.should be_ignore_exceptions
+      expect(described_class).to be_ignore_exceptions
     end
 
     it "false if @ignore_exceptions is set to false" do
       described_class.ignore_exceptions = false
-      described_class.should_not be_ignore_exceptions
+      expect(described_class).not_to be_ignore_exceptions
     end
 
     it "true if Rails.action_dispatch.show_exceptions is set to true for older Rails" do
-      described_class.stub(legacy_rails?: true)
+      allow(described_class).to receive_messages(legacy_rails?: true)
       described_class.ignore_exceptions = nil
-      ::Rails.stub_chain(:configuration, :action_dispatch, :show_exceptions).and_return(true)
+      allow(::Rails).to receive_message_chain(:configuration,
+        :action_dispatch, :show_exceptions).and_return(true)
 
-      described_class.should be_ignore_exceptions
+      expect(described_class).to be_ignore_exceptions
     end
 
     it "true if Rails.action_dispatch.show_exceptions is set to true for Rails 3" do
-      described_class.stub(legacy_rails?: false)
+      allow(described_class).to receive_messages(legacy_rails?: false)
       described_class.ignore_exceptions = nil
-      ::Rails.stub_chain(:application, :config, :action_dispatch, :show_exceptions).and_return(true)
+      allow(::Rails).to receive_message_chain(:application,
+        :config, :action_dispatch, :show_exceptions).and_return(true)
 
-      described_class.should be_ignore_exceptions
+      expect(described_class).to be_ignore_exceptions
     end
 
     it "false if Rails.action_dispatch.show_exceptions is set to false for older Rails" do
-      described_class.stub(legacy_rails?: true)
+      allow(described_class).to receive_messages(legacy_rails?: true)
       described_class.ignore_exceptions = nil
-      ::Rails.stub_chain(:configuration, :action_dispatch, :show_exceptions).and_return(false)
+      allow(::Rails).to receive_message_chain(:configuration,
+        :action_dispatch, :show_exceptions).and_return(false)
 
-      described_class.should_not be_ignore_exceptions
+      expect(described_class).not_to be_ignore_exceptions
     end
 
     it "true if Rails.action_dispatch.show_exceptions is set to false for Rails 3" do
-      described_class.stub(legacy_rails?: false)
+      allow(described_class).to receive_messages(legacy_rails?: false)
       described_class.ignore_exceptions = nil
-      ::Rails.stub_chain(:application, :config, :action_dispatch, :show_exceptions).and_return(false)
+      allow(::Rails).to receive_message_chain(:application,
+        :config, :action_dispatch, :show_exceptions).and_return(false)
 
-      described_class.should_not be_ignore_exceptions
+      expect(described_class).not_to be_ignore_exceptions
     end
   end
 
@@ -96,15 +106,15 @@ describe Watir::Rails do
       fake_thread = double("thread", join: :still_running)
       described_class.instance_variable_set(:@server_thread, fake_thread)
 
-      described_class.should_not be_running
+      expect(described_class).not_to be_running
     end
 
     it "false if server cannot be accessed" do
       fake_thread = double("thread", join: nil)
       described_class.instance_variable_set(:@server_thread, fake_thread)
 
-      Net::HTTP.should_receive(:start).and_raise Errno::ECONNREFUSED
-      described_class.should_not be_running
+      expect(Net::HTTP).to receive(:start).and_raise Errno::ECONNREFUSED
+      expect(described_class).not_to be_running
     end
 
     it "false if server response is not success" do
@@ -114,8 +124,8 @@ describe Watir::Rails do
       described_class.instance_variable_set(:@app, app)
 
       response = double(Net::HTTPSuccess, is_a?: false)
-      Net::HTTP.should_receive(:start).and_return response
-      described_class.should_not be_running
+      expect(Net::HTTP).to receive(:start).and_return response
+      expect(described_class).not_to be_running
     end    
 
     it "true if server response is success" do
@@ -125,8 +135,8 @@ describe Watir::Rails do
       described_class.instance_variable_set(:@app, app)
 
       response = double(Net::HTTPSuccess, is_a?: true, body: app.object_id.to_s)
-      Net::HTTP.should_receive(:start).and_return response
-      described_class.should be_running
+      expect(Net::HTTP).to receive(:start).and_return response
+      expect(described_class).to be_running
     end
   end
 end

data/watir-rails.gemspec

@@ -19,11 +19,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency "rack"
   gem.add_dependency "rails"
   gem.add_dependency "watir", "~> 5.0"
-  # This is needed to make sure that mime-types 2.x is not installed because
-  # actionmailer has a mail ~> 2.5.4 as its dependency, which needs mime-types ~> 1.16
-  gem.add_dependency "mime-types", "~> 1.16"
 
   gem.add_development_dependency "yard"
   gem.add_development_dependency "redcarpet"
-  gem.add_development_dependency "rspec", "~>2.0"
+  gem.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watir-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Jarmo Pertman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-28 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 description: Use Watir (http://github.com/watir/watir) in Rails.
 email:
 - jarmo.p@gmail.com
@@ -156,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Use Watir (http://github.com/watir/watir) in Rails.