JariBakken: Fix specs and warnings for Ruby 1.9.3

r13176
kostyukdg · Aug 2, 2011 · f93faae · f93faae
1 parent bb928d8
commit f93faae
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/rb/lib/selenium/rake/server_task.rb b/rb/lib/selenium/rake/server_task.rb
@@ -3,12 +3,10 @@
 
 module Selenium
   module Rake
-    include ::Rake::DSL if defined?(::Rake::DSL)
 
     class MissingJarFileError < StandardError
     end
 
-
     #
     # Defines rake tasks for starting, stopping and restarting the Selenium server.
     #
@@ -28,6 +26,7 @@ class MissingJarFileError < StandardError
     #
 
     class ServerTask
+      include ::Rake::DSL if defined?(::Rake::DSL)
 
       #
       # Path to the selenium server jar

diff --git a/rb/lib/selenium/webdriver/common/socket_poller.rb b/rb/lib/selenium/webdriver/common/socket_poller.rb
@@ -73,7 +73,7 @@ def listening?
 
           sock.close
           true
-        rescue *NOT_CONNECTED_ERRORS => e
+        rescue *NOT_CONNECTED_ERRORS
           $stderr.puts [@host, @port].inspect if $DEBUG
           false
         end

diff --git a/rb/spec/integration/selenium/webdriver/firefox/profile_spec.rb b/rb/spec/integration/selenium/webdriver/firefox/profile_spec.rb
@@ -8,14 +8,10 @@ module Firefox
         let(:profile) { Profile.new }
 
         def read_generated_prefs(from = nil)
-          io = StringIO.new
-
-          File.stub(:open).and_yield(io)
           prof = from || profile()
+          dir = prof.layout_on_disk
 
-          prof.layout_on_disk
-
-          io.string
+          File.read(File.join(dir, 'user.js'))
         end
 
         it "should set additional preferences" do