watir-rails 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe6ed7ba7dacef41325223e9976762b5127a0c7a
-  data.tar.gz: 39d4cc9bcf2e081eb2e0c9d782131a527bed6196
+  metadata.gz: 9a45f26d9da43e400198f49fc425cbe39a382631
+  data.tar.gz: ac2b52867c14b010cbebc456db6b2e4ccea2dd18
 SHA512:
-  metadata.gz: e2767595de51478f889becb4be7f395f2333fe2020c3edfc25e3e5058e6c47cf365a55defdf210b0983ef445f6417b6b27a00895f4f1f644e1395698db0cede8
-  data.tar.gz: eb1c37f5b2b112b807e6f45c89f1cd01087a4c1c6f5b1bc7daaf1ea9a4c1ad2f15c9096e630b3a6543633db839771b020babcfe9e05301666c477ff4eb04751b
+  metadata.gz: e5a99d40534ecb7e91f12c90f6c310253c3bd79c0955178c9ac67650e063fb84dc1b54d7418fa4c76b989dd3943c346d22966b74db7c0a6839f8c43ec09ab243
+  data.tar.gz: b05f51b501f5c6ed21efc0cebd5b3e74dd3c3bcea3de129bbec5175d625397f7d8b85e21970ce25e1616da69b2a8d6f90b319ad1efb5d92d51e207e586afe327

data/.travis.yml

@@ -1,8 +1,6 @@
 rvm:
- - 2.6.2
- - 2.5.5
- - 2.4.5
- - ruby-head
+  - 2.6.3
+  - ruby-head
 gemfile:
   - gemfiles/Gemfile.rails-2.x
   - gemfiles/Gemfile.rails-3.x

data/CHANGES.md

@@ -1,41 +1,46 @@
-### 2.1.0 - 2019/03/19
-
-* Add support for specifying Rails test-server port. PR #22 by Bartek Wilczek.
-
-### 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.
-
-### 1.2.0 - 2016/01/16
-
-* Add support for running Rails on Puma server. PR #15 by Andrey Koleshko.
-
-### 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.
-
-### 1.0.3 - 2013/11/02
-
-* Make watir-rails working with Rails 2.3.x too.
-
-### 1.0.2 - 2013/11/02
-
-* Make sure that newest Rails is going to be installed on an empty system.
-
-### 1.0.1 - 2013/11/01
-
-* Add license to gemspec.
-
-### 1.0.0 - 2013/10/05
-
-* Add watir as a dependency to make it possible to use with watir-classic too.
-* Add specs to keep the quality high.
-* Documentation fixes.
+### 2.2.0 - 2019
+
+* Add support for specifying custom server for test Rails instance. PR #23 by Alex Rodionov.
+* Add support for cleaning up when test Rails server instance has served all requests. PR #23 by Alex Rodionov.
+
+### 2.1.0 - 2019/03/19
+
+* Add support for specifying Rails test-server port. PR #22 by Bartek Wilczek.
+
+### 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.
+
+### 1.2.0 - 2016/01/16
+
+* Add support for running Rails on Puma server. PR #15 by Andrey Koleshko.
+
+### 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.
+
+### 1.0.3 - 2013/11/02
+
+* Make watir-rails working with Rails 2.3.x too.
+
+### 1.0.2 - 2013/11/02
+
+* Make sure that newest Rails is going to be installed on an empty system.
+
+### 1.0.1 - 2013/11/01
+
+* Add license to gemspec.
+
+### 1.0.0 - 2013/10/05
+
+* Add watir as a dependency to make it possible to use with watir-classic too.
+* Add specs to keep the quality high.
+* Documentation fixes.

data/lib/watir/rails.rb

@@ -18,7 +18,7 @@ module Watir
     class << self
       private :new
       attr_reader :port, :middleware
-      attr_writer :ignore_exceptions
+      attr_writer :ignore_exceptions, :server
 
       # Start the Rails server for tests.
       # Will be called automatically by {Watir::Browser#initialize}.
@@ -30,7 +30,7 @@ module Watir
           @port = port || find_available_port
 
           @server_thread = Thread.new do
-            run_default_server @middleware, @port
+            server.call @middleware, @port
           end
 
           Timeout.timeout(boot_timeout) { @server_thread.join(0.1) until running? }
@@ -67,6 +67,13 @@ module Watir
         @middleware.error
       end
 
+      # Returns true if there are pending requests to server.
+      #
+      # @return [Boolean]
+      def pending_requests?
+        @middleware.pending_requests?
+      end
+
       # Set error rescued by the middleware.
       #
       # @param value
@@ -139,22 +146,24 @@ module Watir
         server.close if server
       end
 
-      def run_default_server(app, port)
-        begin
-          require 'rack/handler/thin'
-          Thin::Logging.silent = true
-          return Rack::Handler::Thin.run(app, :Port => port)
-        rescue LoadError
-        end
+      def server
+        @server ||= lambda do |app, port|
+          begin
+            require 'rack/handler/thin'
+            Thin::Logging.silent = true
+            return Rack::Handler::Thin.run(app, :Port => port)
+          rescue LoadError
+          end
 
-        begin
-          require 'rack/handler/puma'
-          return Rack::Handler::Puma.run(app, :Port => port, :Silent => true)
-        rescue LoadError
-        end
+          begin
+            require 'rack/handler/puma'
+            return Rack::Handler::Puma.run(app, :Port => port, :Silent => true)
+          rescue LoadError
+          end
 
-        require 'rack/handler/webrick'
-        Rack::Handler::WEBrick.run(app, :Port => port, :AccessLog => [], :Logger => WEBrick::Log::new(nil, 0))
+          require 'rack/handler/webrick'
+          Rack::Handler::WEBrick.run(app, :Port => port, :AccessLog => [], :Logger => WEBrick::Log::new(nil, 0))
+        end
       end
 
       def legacy_rails?

data/lib/watir/rails/middleware.rb

@@ -1,26 +1,50 @@
-module Watir
-  class Rails
-    # @private
-    class Middleware
-      attr_accessor :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
-            raise e
-          end
-        end
-      end
-    end
-
-  end
-end
+module Watir
+  class Rails
+    # @private
+    class Middleware
+      class PendingRequestsCounter
+        attr_reader :value
+
+        def initialize
+          @value = 0
+          @mutex = Mutex.new
+        end
+
+        def increment
+          @mutex.synchronize { @value += 1 }
+        end
+
+        def decrement
+          @mutex.synchronize { @value -= 1 }
+        end
+      end
+
+      attr_accessor :error
+
+      def initialize(app)
+        @app = app
+        @counter = PendingRequestsCounter.new
+      end
+
+      def pending_requests?
+        @counter.value > 0
+      end
+
+      def call(env)
+        if env["PATH_INFO"] == "/__identify__"
+          [200, {}, [@app.object_id.to_s]]
+        else
+          @counter.increment
+          begin
+            @app.call(env)
+          rescue => e
+            @error = e
+            raise e
+          ensure
+            @counter.decrement
+          end
+        end
+      end
+    end
+  end
+end

data/lib/watir/version.rb

@@ -1,5 +1,5 @@
-module Watir
-  class Rails
-    VERSION = "2.1.0"
-  end
-end
+module Watir
+  class Rails
+    VERSION = "2.2.0"
+  end
+end

data/spec/watir/rails_spec.rb

@@ -9,9 +9,11 @@ describe Watir::Rails do
 
   context ".boot" do
     it "starts the server unless already running" do
+      server = ->(app, port) {}
       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
+      expect(described_class).to receive(:server).and_return(server)
+      expect(server).to receive(:call).once
 
       described_class.boot
       wait_until_server_started
@@ -20,16 +22,18 @@ describe Watir::Rails do
     it "does nothing if server is already running" do
       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)
+      expect(described_class).not_to receive(:server)
 
       described_class.boot
     end
 
     it "raises an error if Rails won't boot with timeout" do
+      server = ->(app, port) {}
       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).to receive(:server).and_return(server)
+      expect(server).to receive(:call)
 
       expect {
         described_class.boot
@@ -41,6 +45,19 @@ describe Watir::Rails do
     end
   end
 
+  context ".server" do
+    it "allows to customize server" do
+      allow(described_class).to receive_messages(app: double("app"), find_available_port: 42)
+      allow(described_class).to receive(:running?).twice.and_return(false, true)
+
+      server = ->(app, port) {}
+      described_class.server = server
+      expect(server).to receive(:call)
+
+      described_class.boot
+    end
+  end
+
   context ".host" do
     it "@host if specified" do
       described_class.host = "my_host"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watir-rails
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Jarmo Pertman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-19 00:00:00.000000000 Z
+date: 2019-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack