@@ -1,13 +1,7 @@ require "webrat" gem "selenium-client", ">=1.2.14" require "selenium/client" - -# active_support already defines silence_stream, no need to do that again if it's already present. -# http://github.com/rails/rails/blob/master/activesupport/lib/active_support/core_ext/kernel/reporting.rb -unless Kernel.respond_to?(:silence_stream) - require "webrat/selenium/silence_stream" -end - +require "webrat/selenium/silence_stream" require "webrat/selenium/selenium_session" require "webrat/selenium/matchers" require "webrat/core_extensions/tcp_socket" lib/webrat/selenium.rb @@ -1,14 +1,18 @@ module Webrat module Selenium module SilenceStream - def silence_stream(stream) - old_stream = stream.dup - stream.reopen(RUBY_PLATFORM =~ /mswin/ ? 'NUL:' : '/dev/null') - stream.sync = true - yield - ensure - stream.reopen(old_stream) - end + # active_support already defines silence_stream, no need to do that again if it's already present. + # http://github.com/rails/rails/blob/master/activesupport/lib/active_support/core_ext/kernel/reporting.rb + unless Kernel.respond_to?(:silence_stream) + def silence_stream(stream) + old_stream = stream.dup + stream.reopen(RUBY_PLATFORM =~ /mswin/ ? 'NUL:' : '/dev/null') + stream.sync = true + yield + ensure + stream.reopen(old_stream) + end + end end end end \ No newline at end of file lib/webrat/selenium/silence_stream.rb @@ -2,9 +2,12 @@ require 'test_helper' class WebratTest < ActionController::IntegrationTest - test "should visit fully qualified urls" do - visit root_url(:host => "chunkybacon.example.com") - assert_equal "chunkybacon", request.subdomains.first + #Firefox raises a security concern under Selenium + unless ENV['WEBRAT_INTEGRATION_MODE'] == 'selenium' + test "should visit fully qualified urls" do + visit root_url(:host => "chunkybacon.example.com") + assert_equal "chunkybacon", request.subdomains.first + end end test "should visit pages" do @@ -68,9 +71,12 @@ class WebratTest < ActionController::IntegrationTest assert_have_selector "h1" end - test "should detect infinite redirects" do - assert_raises Webrat::InfiniteRedirectError do - visit infinite_redirect_path + # Firefox detects and prevents infinite redirects under Selenium + unless ENV['WEBRAT_INTEGRATION_MODE'] == 'selenium' + test "should detect infinite redirects" do + assert_raises Webrat::InfiniteRedirectError do + visit infinite_redirect_path + end end end spec/integration/rails/test/integration/webrat_test.rb 73dc59cc293cfa6e343c6f167a352558abb75351 Matthias Marschall mm@agileweboperations.com http://github.com/jwilger/webrat/commit/6cd734aec9c701e0b8db605ba32a895487c6f7ad 6cd734aec9c701e0b8db605ba32a895487c6f7ad 2009-05-29T15:05:35-07:00 2009-05-29T01:24:51-07:00 made selenium integration tests run applying larrytheliquid's patch: http://github.com/larrytheliquid/webrat/commit/627913708c563f136f17d7da1b85b961f20f143b 51c0aca9061ba2ca383e84e17d335497443f7f1b mike.gaffney mike.gaffney@asolutions.com