rb: Share Service#connect_until_stable

SeleniumHQ · May 31, 2016 · 29fc6d7 · 29fc6d7
1 parent 5c63343
commit 29fc6d7
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 24 deletions.
diff --git a/rb/lib/selenium/webdriver/chrome/service.rb b/rb/lib/selenium/webdriver/chrome/service.rb
@@ -57,12 +57,8 @@ def stop_server
           connect_to_server { |http| http.get("/shutdown") }
         end
 
-        def connect_until_stable
-          socket_poller = SocketPoller.new @host, @port, START_TIMEOUT
-
-          unless socket_poller.connected?
-            raise Error::WebDriverError, "unable to connect to chromedriver #{@host}:#{@port}"
-          end
+        def cannot_connect_error_text
+          "unable to connect to chromedriver #{@host}:#{@port}"
         end
 
       end # Service

diff --git a/rb/lib/selenium/webdriver/common/service.rb b/rb/lib/selenium/webdriver/common/service.rb
@@ -20,6 +20,14 @@
 module Selenium
   module WebDriver
 
+    #
+    # Base class implementing default behavior of service object,
+    # responsible for starting and stopping driver implementations.
+    #
+    # Subclasses must implement the following private methods:
+    #   * #start_process
+    #   * #stop_server
+    #   * #cannot_connect_error_text
     #
     # @api private
     #
@@ -99,6 +107,12 @@ def stop_process
       end
 
       def connect_until_stable
+        socket_poller = SocketPoller.new @host, @port, START_TIMEOUT
+        return if socket_poller.connected?
+        raise Error::WebDriverError, cannot_connect_error_text
+      end
+
+      def cannot_connect_error_text
         raise NotImplementedError, "subclass responsibility"
       end
 

diff --git a/rb/lib/selenium/webdriver/edge/service.rb b/rb/lib/selenium/webdriver/edge/service.rb
@@ -57,12 +57,8 @@ def start_process
           @process.start
         end
 
-        def connect_until_stable
-          socket_poller = SocketPoller.new @host, @port, START_TIMEOUT
-
-          unless socket_poller.connected?
-            raise Error::WebDriverError, "unable to connect to MicrosoftWebDriver #{@host}:#{@port}"
-          end
+        def cannot_connect_error_text
+          "unable to connect to MicrosoftWebDriver #{@host}:#{@port}"
         end
 
       end # Service

diff --git a/rb/lib/selenium/webdriver/firefox/service.rb b/rb/lib/selenium/webdriver/firefox/service.rb
@@ -71,12 +71,8 @@ def stop_server
           connect_to_server { |http| http.head("/shutdown") }
         end
 
-        def connect_until_stable
-          @socket_poller = SocketPoller.new @host, @port, START_TIMEOUT
-
-          unless @socket_poller.connected?
-            raise Error::WebDriverError, "unable to connect to Mozilla Wires #{@host}:#{@port}"
-          end
+        def cannot_connect_error_text
+          "unable to connect to Mozilla Wires #{@host}:#{@port}"
         end
 
       end # Service

diff --git a/rb/lib/selenium/webdriver/phantomjs/service.rb b/rb/lib/selenium/webdriver/phantomjs/service.rb
@@ -70,12 +70,8 @@ def stop_server
           connect_to_server { |http| http.get("/shutdown") }
         end
 
-        def connect_until_stable
-          socket_poller = SocketPoller.new @host, @port, START_TIMEOUT
-
-          unless socket_poller.connected?
-            raise Error::WebDriverError, "unable to connect to phantomjs @ #{uri} after #{START_TIMEOUT} seconds"
-          end
+        def cannot_connect_error_text
+          "unable to connect to phantomjs @ #{uri} after #{START_TIMEOUT} seconds"
         end
 
       end # Service