Add Driver#remote_status for the Ruby remote driver. Fixes issue 5669.

jarib · jarib · commit ee8e280a58ee · 2013-06-11T14:56:52.000-04:00
diff --git a/rb/CHANGES b/rb/CHANGES
@@ -1,16 +1,18 @@
 2.34.0 (???)
 ============
 
+* Add `Driver#remote_status` to the remote driver (#5669)
+
 2.33.0 (2013-05-26)
 ===================
 
 Remote:
   * Support rotating devices, such as iPhone & iPad in simulator and Android browser in emulator
   * Support for interacting with touch screen devices, such as iPhone & iPad in simulator and Android browser in emulator
-  * Improve error messages for invalid wire protocol responses 
+  * Improve error messages for invalid wire protocol responses
 Chrome:
   * Accept :service_log_path for Chrome. (#3475)
-IE: 
+IE:
   * IE >=9 versions triggerMouseEvent like other browsers (#2218).
 Various:
   * Element#text ignores elements in <head>
diff --git a/rb/lib/selenium/webdriver/common.rb b/rb/lib/selenium/webdriver/common.rb
@@ -33,6 +33,7 @@
 require 'selenium/webdriver/common/driver_extensions/has_location'
 require 'selenium/webdriver/common/driver_extensions/has_session_id'
 require 'selenium/webdriver/common/driver_extensions/has_touch_screen'
+require 'selenium/webdriver/common/driver_extensions/has_remote_status'
 require 'selenium/webdriver/common/driver_extensions/uploads_files'
 require 'selenium/webdriver/common/keys'
 require 'selenium/webdriver/common/bridge_helper'
diff --git a/rb/lib/selenium/webdriver/common/driver_extensions/has_remote_status.rb b/rb/lib/selenium/webdriver/common/driver_extensions/has_remote_status.rb
@@ -0,0 +1,13 @@
+module Selenium
+  module WebDriver
+    module DriverExtensions
+      module HasRemoteStatus
+
+        def remote_status
+          @bridge.status
+        end
+
+      end
+    end
+  end
+end
diff --git a/rb/lib/selenium/webdriver/remote/bridge.rb b/rb/lib/selenium/webdriver/remote/bridge.rb
@@ -82,7 +82,8 @@ def driver_extensions
             DriverExtensions::TakesScreenshot,
             DriverExtensions::HasSessionId,
             DriverExtensions::Rotatable,
-            DriverExtensions::HasTouchScreen
+            DriverExtensions::HasTouchScreen,
+            DriverExtensions::HasRemoteStatus
           ]
         end
 
@@ -101,6 +102,10 @@ def create_session(desired_capabilities)
           Capabilities.json_create resp['value']
         end
 
+        def status
+          execute :status
+        end
+
         def get(url)
           execute :get, {}, :url => url
         end
diff --git a/rb/lib/selenium/webdriver/remote/commands.rb b/rb/lib/selenium/webdriver/remote/commands.rb
@@ -7,6 +7,7 @@ class Selenium::WebDriver::Remote::Bridge
 
   command :newSession,                             :post,    "session"
   command :getCapabilities,                        :get,     "session/:session_id"
+  command :status,                                 :get,     "status"
 
   #
   # basic driver
diff --git a/rb/spec/integration/selenium/webdriver/remote/driver_spec.rb b/rb/spec/integration/selenium/webdriver/remote/driver_spec.rb
@@ -6,6 +6,11 @@ module Remote
         it "should expose session_id" do
           driver.session_id.should be_kind_of(String)
         end
+
+        it "should expose remote status" do
+          driver.should be_kind_of(DriverExtensions::HasRemoteStatus)
+          driver.remote_status.should be_kind_of(Hash)
+        end
       end
 
     end # Remote

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ class Selenium::WebDriver::Remote::Bridge`
`7`	`7`
`8`	`8`	`command :newSession, :post, "session"`
`9`	`9`	`command :getCapabilities, :get, "session/:session_id"`
	`10`	`+ command :status, :get, "status"`
`10`	`11`
`11`	`12`	`#`
`12`	`13`	`# basic driver`