rb: Revert RSpec to 2.99 until we find a way to make Rack server silent

jmif · Sep 18, 2015 · a289421 · a289421
1 parent c7d9e98
commit a289421
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/rb/selenium-webdriver.gemspec b/rb/selenium-webdriver.gemspec
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "childprocess", ["~> 0.5"]
   s.add_runtime_dependency "websocket", ["~> 1.0"]
 
-  s.add_development_dependency "rspec", ["~> 3.0"]
+  s.add_development_dependency "rspec", ["~> 2.99.0"]
   s.add_development_dependency "rack", ["~> 1.0"]
   s.add_development_dependency "ci_reporter", ["~> 1.6", ">= 1.6.2"]
   s.add_development_dependency "webmock", ["~> 1.7", ">= 1.7.5"]

diff --git a/rb/spec/integration/selenium/webdriver/spec_support/rack_server.rb b/rb/spec/integration/selenium/webdriver/spec_support/rack_server.rb
@@ -50,7 +50,7 @@ def start
         end
 
         def run
-          handler.run @app, run_options_for(handler)
+          handler.run @app, :Host => @host, :Port => @port
         end
 
         def where_is(file)
@@ -90,16 +90,6 @@ def load_handler(handler)
           false
         end
 
-        def run_options_for(handler)
-          run_opts = {:Host => @host, :Port => @port}
-
-          if handler == Rack::Handler::WEBrick
-            run_opts.merge!(:Logger => WEBrick::Log.new("/dev/null"), :AccessLog => [])
-          end
-
-          run_opts
-        end
-
         def start_forked
           @pid = fork { run }
         end