Various minor fixes

Author: jarib

rb/lib/selenium/webdriver/safari.rb

@@ -14,13 +14,13 @@ def path=(path)
         def path
           @path ||= (
             path = case Platform.os
-            when :windows
-              Platform.find_in_program_files("Safari\\Safari.exe")
-            when :macosx
-              "/Applications/Safari.app/Contents/MacOS/Safari"
-            else
-              Platform.find_binary("Safari")
-            end
+                   when :windows
+                     Platform.find_in_program_files("Safari\\Safari.exe")
+                   when :macosx
+                     "/Applications/Safari.app/Contents/MacOS/Safari"
+                   else
+                     Platform.find_binary("Safari")
+                   end
 
             unless File.file?(path) && File.executable?(path)
               raise Error::WebDriverError, "unable to find the Safari executable, please set Selenium::WebDriver::Safari.path= or add it to your PATH."

rb/lib/selenium/webdriver/safari/extension.rb

@@ -47,6 +47,7 @@ def install
           return if @installed
 
           if install_directory.exist?
+            backup_directory.rmtree if backup_directory.exist?
             FileUtils.mv install_directory.to_s, backup_directory.to_s
           end
 

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

@@ -33,7 +33,10 @@ def reset_driver!
         end
 
         def quit_driver
-          @driver_instance.quit if @driver_instance
+          if @driver_instance
+            @driver_instance.quit
+            @driver_instance = nil
+          end
         end
 
         def new_driver_instance
@@ -43,7 +46,7 @@ def new_driver_instance
 
         def app_server
           @app_server ||= (
-            path = File.join(root_folder, "common/src/web")
+            path = File.join(root, "common/src/web")
             s = RackServer.new(path)
             s.start
 
@@ -63,7 +66,7 @@ def remote_server
         end
 
         def remote_server_jar
-          @remote_server_jar ||= File.join(root_folder, "build/java/server/test/org/openqa/selenium/server-with-tests-standalone.jar")
+          @remote_server_jar ||= File.join(root, "build/java/server/test/org/openqa/selenium/server-with-tests-standalone.jar")
         end
 
         def quit
@@ -93,12 +96,12 @@ def url_for(filename)
           url
         end
 
-        private
-
-        def root_folder
-          @root_folder ||= File.expand_path("../../../../../../../", __FILE__)
+        def root
+          @root ||= File.expand_path("../../../../../../../", __FILE__)
         end
 
+        private
+
         def create_driver
           instance = case driver
                      when :remote

rb/spec/unit/selenium/webdriver/remote/bridge_spec.rb

@@ -3,14 +3,14 @@
 module Selenium
   module WebDriver
     module Remote
-      
+
       describe Bridge do
         it "raises ArgumentError if passed invalid options" do
           lambda { Bridge.new(:foo => 'bar') }.should raise_error(ArgumentError)
         end
 
         it "raises WebDriverError if uploading non-files" do
-          request_body = {:sessionId => '11123', :value => {}}.to_json
+          request_body = WebDriver.json_dump(:sessionId => '11123', :value => {})
           headers = {'Content-Type' => 'application/json'}
           stub_request(:post, "http://127.0.0.1:4444/wd/hub/session").to_return(
             :status => 200, :body => request_body, :headers => headers)