rb - fix build issues for legacy firefox

Author: titusfortner

rake-tasks/crazy_fun/mappings/ruby.rb

@@ -14,7 +14,7 @@ def add_all(fun)
 
   class RubyLibrary < Tasks
 
-    def handle(fun, dir, args)
+    def handle(_fun, dir, args)
       desc "Build #{args[:name]} in build/#{dir}"
       task_name = task_name(dir, args[:name])
 
@@ -54,14 +54,14 @@ def build_dir
   end
 
   class CheckTestArgs
-    def handle(fun, dir, args)
+    def handle(_fun, dir, args)
       raise "no :srcs specified for #{dir}" unless args.has_key? :srcs
       raise "no :name specified for #{dir}" unless args.has_key? :name
     end
   end
 
   class AddTestDefaults
-    def handle(fun, dir, args)
+    def handle(_fun, dir, args)
       args[:include] = Array(args[:include])
       args[:include] << "#{dir}/spec"
 
@@ -76,7 +76,7 @@ def handle(fun, dir, args)
   end
 
   class AddTestDependencies < Tasks
-    def handle(fun, dir, args)
+    def handle(_fun, dir, args)
       task = Rake::Task[task_name(dir, "#{args[:name]}-test")]
 
       if args.has_key?(:deps)
@@ -86,14 +86,16 @@ def handle(fun, dir, args)
   end
 
   class RubyTest < Tasks
-    def handle(fun, dir, args)
+    def handle(_fun, dir, args)
       desc "Run ruby tests for #{args[:name]}"
       task task_name(dir, "#{args[:name]}-test") => %W[//#{dir}:bundle] do
         STDOUT.sync = true
         puts "Running: #{args[:name]} ruby tests"
 
         if args[:name].match /^remote-(.*)/
-          ENV['WD_REMOTE_BROWSER'] = $1
+          puts $1
+          ENV['WD_REMOTE_BROWSER'] = $1.tr('-', '_')
+          puts ENV['WD_REMOTE_BROWSER']
           ENV['WD_SPEC_DRIVER'] = 'remote'
         else
           ENV['WD_SPEC_DRIVER'] = args[:name].tr('-', '_')
@@ -113,7 +115,7 @@ def handle(fun, dir, args)
   end
 
   class RubyDocs < Tasks
-    def handle(fun, dir, args)
+    def handle(_fun, dir, args)
       files = args[:files] || raise("no :files specified for rubydocs")
       output_dir = args[:output_dir] || raise("no :output_dir specified for rubydocs")
       readme = args[:readme] || raise("no :readme specified for rubydocs")
@@ -135,7 +137,7 @@ def handle(fun, dir, args)
   end # RubyDocs
 
   class RubyGem
-    def handle(fun, dir, args)
+    def handle(_fun, dir, args)
       raise "no :gemspec for rubygem" unless args[:gemspec]
 
       define_clean_task     dir, args
@@ -163,22 +165,22 @@ def define_build_task(dir, args)
       end
     end
 
-    def define_clean_task(dir, args)
+    def define_clean_task(dir, _args)
       desc 'Clean rubygem artifacts'
       task "//#{dir}:gem:clean" do
         rm_rf "build/*.gem"
       end
     end
 
-    def define_release_task(dir, args)
+    def define_release_task(dir, _args)
       desc 'Build and release the ruby gem to Gemcutter'
       task "//#{dir}:gem:release" => %W[//#{dir}:gem:clean //#{dir}:gem:build] do
         gem = Dir['build/*.gem'].first # safe as long as :clean does its job
         sh "gem", "push", gem
       end
     end
 
-    def define_gem_install_task(dir, args)
+    def define_gem_install_task(dir, _args)
       desc 'Install gem dependencies for the current Ruby'
       task "//#{dir}:bundle" do
         ENV['BUNDLE_GEMFILE'] = 'rb/Gemfile'

rb/build.desc

@@ -6,6 +6,7 @@ rubygem(
     "//rb:support",
     "//rb:edge",
     "//rb:firefox",
+    "//rb:ff-legacy",
     "//rb:ie",
     "//rb:phantomjs",
     "//rb:remote",
@@ -29,6 +30,7 @@ ruby_library(name = "common",
     "lib/selenium/webdriver/common.rb",
     "lib/selenium/webdriver/remote/**/*.rb",
     "lib/selenium/webdriver/remote.rb",
+    "lib/selenium/webdriver/atoms.rb",
     "lib/selenium/webdriver.rb",
     "lib/selenium/server.rb",
     "lib/selenium-webdriver.rb",
@@ -42,15 +44,6 @@ ruby_library(name = "common",
   ]
 )
 
-ruby_library(name = "w3c",
-  srcs = [
-    "lib/selenium/webdriver/atoms.rb",
-  ],
-  resources = [
-    { "//javascript/webdriver/atoms:getAttribute": "rb/lib/selenium/webdriver/atoms/getAttribute.js"}
-  ]
-)
-
 ruby_library(name = "support",
   srcs = [
     "lib/selenium/webdriver/support/**/*.rb",
@@ -89,7 +82,7 @@ ruby_test(name = "edge",
     "spec/integration/selenium/webdriver/edge/**/*_spec.rb"
   ],
   include = ["rb/spec/integration", "build/rb/lib"],
-  deps = [ ":edge", ":w3c" ]
+  deps = [ ":edge" ]
 )
 
 ruby_library(name = "ff-legacy",
@@ -120,22 +113,8 @@ ruby_library(name = "firefox",
     "lib/selenium/webdriver/firefox/**/*.rb",
     "lib/selenium/webdriver/firefox.rb"
   ],
-  deps = [":common", ":w3c"]
-)
-
-ruby_test(name = "ff-legacy",
-  srcs = [
-    "spec/integration/selenium/webdriver/*_spec.rb",
-    "spec/integration/selenium/webdriver/firefox/**/*_spec.rb"
-  ],
-  include = ["rb/spec/integration", "build/rb/lib"],
-  deps = [":ff-legacy"]
-)
-
-ruby_library(name = "firefox",
-  srcs = [
-    "lib/selenium/webdriver/firefox/**/*.rb",
-    "lib/selenium/webdriver/firefox.rb"
+  resources = [
+    { "//javascript/webdriver/atoms:getAttribute": "rb/lib/selenium/webdriver/atoms/getAttribute.js"}
   ],
   deps = [":common"]
 )
@@ -166,23 +145,6 @@ ruby_test(name = "ie",
   deps = [ ":ie" ]
 )
 
-ruby_library(name = "marionette",
-  srcs = [
-    "lib/selenium/webdriver/firefox/**/*.rb",
-    "lib/selenium/webdriver/firefox.rb"
-  ],
-  deps = [":common"]
-)
-
-ruby_test(name = "marionette",
-  srcs = [
-    "spec/integration/selenium/webdriver/*_spec.rb",
-    "spec/integration/selenium/webdriver/firefox/**/*_spec.rb"
-  ],
-  include = ["rb/spec/integration", "build/rb/lib"],
-  deps = [":marionette"]
-)
-
 ruby_library(name = "phantomjs",
   srcs = [
     "lib/selenium/webdriver/phantomjs/**/*.rb",
@@ -231,6 +193,19 @@ ruby_test(name = "remote-chrome",
     ":chrome"]
 )
 
+ruby_test(name = "remote-ff-legacy",
+  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"],
+  deps = [
+    ":remote",
+    ":ff-legacy"
+  ]
+)
+
 ruby_test(name = "remote-firefox",
   srcs = [
     "spec/integration/selenium/webdriver/*_spec.rb",
@@ -296,19 +271,6 @@ 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"],
-  deps = [
-    ":remote",
-    ":marionette"
-    ]
-)
-
 ruby_library(name = "safari",
   srcs = [
     "lib/selenium/webdriver/safari/**/*.rb",