rb - deprecated ruby versions

Lazik · Jun 9, 2016 · 4227381 · 4227381
1 parent d00ae13
commit 4227381
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 19 deletions.
diff --git a/rb/build.desc b/rb/build.desc
@@ -250,7 +250,7 @@ ruby_test(name = "remote-marionette",
 
 ruby_library(name = "safari",
   srcs = [
-    "lib/selenium/webdriver/safari/**/* .rb",
+    "lib/selenium/webdriver/safari/**/*.rb",
     "lib/selenium/webdriver/safari.rb"
   ],
   deps = [":common"],

diff --git a/rb/lib/selenium/webdriver/common/platform.rb b/rb/lib/selenium/webdriver/common/platform.rb
@@ -91,12 +91,8 @@ def ironruby?
         engine == :ironruby
       end
 
-      def ruby187?
-        !!(RUBY_VERSION =~ /^1\.8\.7/)
-      end
-
-      def ruby19?
-        !!(RUBY_VERSION =~ /^1\.9/)
+      def ruby_version
+        RUBY_VERSION
       end
 
       def windows?
@@ -230,16 +226,15 @@ def interfaces
 end # Selenium
 
 if __FILE__ == $0
-  p :engine      => Selenium::WebDriver::Platform.engine,
-    :os          => Selenium::WebDriver::Platform.os,
-    :ruby187?    => Selenium::WebDriver::Platform.ruby187?,
-    :ruby19?     => Selenium::WebDriver::Platform.ruby19?,
-    :jruby?      => Selenium::WebDriver::Platform.jruby?,
-    :windows?    => Selenium::WebDriver::Platform.windows?,
-    :home        => Selenium::WebDriver::Platform.home,
-    :bitsize     => Selenium::WebDriver::Platform.bitsize,
-    :localhost   => Selenium::WebDriver::Platform.localhost,
-    :ip          => Selenium::WebDriver::Platform.ip,
-    :interfaces  => Selenium::WebDriver::Platform.interfaces,
-    :null_device => Selenium::WebDriver::Platform.null_device
+  p :engine       => Selenium::WebDriver::Platform.engine,
+    :os           => Selenium::WebDriver::Platform.os,
+    :ruby_version => Selenium::WebDriver::Platform.ruby_version,
+    :jruby?       => Selenium::WebDriver::Platform.jruby?,
+    :windows?     => Selenium::WebDriver::Platform.windows?,
+    :home         => Selenium::WebDriver::Platform.home,
+    :bitsize      => Selenium::WebDriver::Platform.bitsize,
+    :localhost    => Selenium::WebDriver::Platform.localhost,
+    :ip           => Selenium::WebDriver::Platform.ip,
+    :interfaces   => Selenium::WebDriver::Platform.interfaces,
+    :null_device  => Selenium::WebDriver::Platform.null_device
 end