rb - fix remote tests

Author: titusfortner

rb/build.desc

@@ -179,6 +179,7 @@ ruby_test(name = "remote",
 ruby_test(name = "remote-chrome",
   srcs = [
     "spec/integration/selenium/webdriver/*_spec.rb",
+    "spec/integration/selenium/webdriver/chrome/**/*_spec.rb",
     "spec/integration/selenium/webdriver/remote/**/*_spec.rb"
   ],
   include = ["rb/spec/integration", "build/rb/lib"],
@@ -188,6 +189,7 @@ ruby_test(name = "remote-chrome",
 ruby_test(name = "remote-firefox",
   srcs = [
     "spec/integration/selenium/webdriver/*_spec.rb",
+    "spec/integration/selenium/webdriver/firefox/**/*_spec.rb",
     "spec/integration/selenium/webdriver/remote/**/*_spec.rb"
   ],
   include = ["rb/spec/integration", "build/rb/lib"],
@@ -200,6 +202,7 @@ ruby_test(name = "remote-firefox",
 ruby_test(name = "remote-phantomjs",
   srcs = [
     "spec/integration/selenium/webdriver/*_spec.rb",
+    "spec/integration/selenium/webdriver/phantomjs/**/*_spec.rb",
     "spec/integration/selenium/webdriver/remote/**/*_spec.rb"
   ],
   include = ["rb/spec/integration", "build/rb/lib"],
@@ -209,7 +212,8 @@ ruby_test(name = "remote-phantomjs",
 ruby_test(name = "remote-safari",
   srcs = [
     "spec/integration/selenium/webdriver/*_spec.rb",
-    "spec/integration/selenium/webdriver/remote/**/*_spec.rb"
+    "spec/integration/selenium/webdriver/remote/**/*_spec.rb",
+    "spec/integration/selenium/webdriver/safari/**/*_spec.rb"
   ],
   include = ["rb/spec/integration", "build/rb/lib"],
   deps = [
@@ -221,6 +225,7 @@ ruby_test(name = "remote-safari",
 ruby_test(name = "remote-ie",
   srcs = [
     "spec/integration/selenium/webdriver/*_spec.rb",
+    "spec/integration/selenium/webdriver/ie/**/*_spec.rb",
     "spec/integration/selenium/webdriver/remote/**/*_spec.rb"
   ],
   include = ["rb/spec/integration", "build/rb/lib"],
@@ -230,6 +235,7 @@ ruby_test(name = "remote-ie",
 ruby_test(name = "remote-edge",
   srcs = [
     "spec/integration/selenium/webdriver/*_spec.rb",
+    "spec/integration/selenium/webdriver/ie/**/*_spec.rb",
     "spec/integration/selenium/webdriver/remote/**/*_spec.rb"
   ],
   include = ["rb/spec/integration", "build/rb/lib"],
@@ -242,6 +248,7 @@ ruby_test(name = "remote-edge",
 ruby_test(name = "remote-marionette",
   srcs = [
     "spec/integration/selenium/webdriver/*_spec.rb",
+    "spec/integration/selenium/webdriver/firefox/**/*_spec.rb",
     "spec/integration/selenium/webdriver/remote/**/*_spec.rb"
   ],
   include = ["rb/spec/integration", "build/rb/lib"],

rb/spec/integration/selenium/webdriver/spec_support/shared_examples/concurrent_driver.rb

@@ -23,7 +23,11 @@
       # start 5 drivers concurrently
       threads, drivers = [], []
 
-      opt = GlobalTestEnv.remote_server? ? {:url => GlobalTestEnv.remote_server.webdriver_url} : {}
+      opt = {}
+      if GlobalTestEnv.remote_server?
+        opt[:url] = GlobalTestEnv.remote_server.webdriver_url
+        opt[:desired_capabilities] = WebDriver::Remote::Capabilities.send(browser_name)
+      end
       opt[:marionette] = true if browser_name == :marionette
 
       5.times do

rb/spec/integration/selenium/webdriver/spec_support/test_environment.rb

@@ -29,7 +29,7 @@ def initialize
           @create_driver_error       = nil
           @create_driver_error_count = 0
 
-          @driver = (ENV['WD_SPEC_DRIVER'] || :chrome).strip.to_sym
+          @driver = (ENV['WD_SPEC_DRIVER'] || :chrome).to_sym
         end
 
         def browser