Add helpers API to normalize path using OS-specific directory separators

* Platform#windows_path converts / to \\ * Platform#unix_path converts \\ to /
qinggumeng · Mar 9, 2019 · 79544d6 · 79544d6
1 parent 76af8b9
commit 79544d6
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/rb/lib/selenium/webdriver/common/platform.rb b/rb/lib/selenium/webdriver/common/platform.rb
@@ -111,13 +111,21 @@ def wrap_in_quotes_if_necessary(str)
         windows? && !cygwin? ? %("#{str}") : str
       end
 
-      def cygwin_path(path, opts = {})
+      def cygwin_path(path, **opts)
         flags = []
         opts.each { |k, v| flags << "--#{k}" if v }
 
         `cygpath #{flags.join ' '} "#{path}"`.strip
       end
 
+      def unix_path(path)
+        path.tr(File::ALT_SEPARATOR, File::SEPARATOR)
+      end
+
+      def windows_path(path)
+        path.tr(File::SEPARATOR, File::ALT_SEPARATOR)
+      end
+
       def make_writable(file)
         File.chmod 0o766, file
       end
@@ -153,7 +161,7 @@ def find_binary(*binary_names)
         binary_names.each do |binary_name|
           paths.each do |path|
             full_path = File.join(path, binary_name)
-            full_path.tr!('\\', '/') if windows?
+            full_path = unix_path(full_path) if windows?
             exe = Dir.glob(full_path).find { |f| File.executable?(f) }
             return exe if exe
           end

diff --git a/rb/lib/selenium/webdriver/firefox/binary.rb b/rb/lib/selenium/webdriver/firefox/binary.rb
@@ -37,7 +37,7 @@ def start_with(profile, profile_path, *args)
           if Platform.cygwin?
             profile_path = Platform.cygwin_path(profile_path, windows: true)
           elsif Platform.windows?
-            profile_path = profile_path.tr('/', '\\')
+            profile_path = Platform.windows_path(profile_path)
           end
 
           ENV['XRE_CONSOLE_LOG'] = profile.log_file if profile.log_file

diff --git a/rb/spec/integration/selenium/webdriver/element_spec.rb b/rb/spec/integration/selenium/webdriver/element_spec.rb
@@ -76,9 +76,8 @@ module WebDriver
         element = driver.find_element(id: 'upload')
         expect(element.attribute('value')).to be_empty
 
-        file = Tempfile.new('file-upload')
-        path = file.path
-        path.tr!('/', '\\') if WebDriver::Platform.windows?
+        path = Tempfile.new('file-upload').path
+        path = WebDriver::Platform.windows_path(path) if WebDriver::Platform.windows?
 
         element.send_keys path
 

diff --git a/rb/spec/integration/selenium/webdriver/spec_support/helpers.rb b/rb/spec/integration/selenium/webdriver/spec_support/helpers.rb
@@ -46,11 +46,11 @@ def url_for(filename)
         end
 
         def fix_windows_path(path)
-          return path unless WebDriver::Platform.os.windows?
+          return path unless WebDriver::Platform.windows?
 
           if GlobalTestEnv.browser == :ie
             path = path[%r{file://(.*)}, 1]
-            path.tr!('/', '\\')
+            path = WebDriver::Platform.windows_path(path)
 
             "file://#{path}"
           else