From 042b416092b0e22dd4010b7cc0403cde3ebdc079 Mon Sep 17 00:00:00 2001 From: Bryan Helmkamp Date: Sat, 19 Sep 2009 17:34:09 -0400 Subject: [PATCH] Whitespace --- lib/webrat/adapters/rails.rb | 2 +- lib/webrat/integrations/merb.rb | 2 +- lib/webrat/integrations/selenium.rb | 2 +- lib/webrat/rspec-rails.rb | 2 +- lib/webrat/selenium/application_servers.rb | 2 +- lib/webrat/selenium/application_servers/external.rb | 2 +- lib/webrat/selenium/selenium_rc_server.rb | 4 ++-- lib/webrat/selenium/silence_stream.rb | 2 +- spec/integration/rails/test/integration/button_click_test.rb | 2 +- spec/integration/rails/test/integration/fill_in_test.rb | 2 +- spec/integration/rails/test/integration/link_click_test.rb | 2 +- spec/public/fill_in_spec.rb | 2 +- spec/public/matchers/have_selector_spec.rb | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/webrat/adapters/rails.rb b/lib/webrat/adapters/rails.rb index 508da4db..1944c8f6 100644 --- a/lib/webrat/adapters/rails.rb +++ b/lib/webrat/adapters/rails.rb @@ -78,4 +78,4 @@ def response #:nodoc: integration_session.response end end -end \ No newline at end of file +end diff --git a/lib/webrat/integrations/merb.rb b/lib/webrat/integrations/merb.rb index 50e75ff6..d5b7ea2a 100644 --- a/lib/webrat/integrations/merb.rb +++ b/lib/webrat/integrations/merb.rb @@ -7,4 +7,4 @@ def request(uri, env = {}) end end end -end \ No newline at end of file +end diff --git a/lib/webrat/integrations/selenium.rb b/lib/webrat/integrations/selenium.rb index 8f991be1..37ebeb55 100644 --- a/lib/webrat/integrations/selenium.rb +++ b/lib/webrat/integrations/selenium.rb @@ -8,4 +8,4 @@ module ActionController #:nodoc: include Webrat::Selenium::Matchers end end -end \ No newline at end of file +end diff --git a/lib/webrat/rspec-rails.rb b/lib/webrat/rspec-rails.rb index 533eb021..56880bce 100644 --- a/lib/webrat/rspec-rails.rb +++ b/lib/webrat/rspec-rails.rb @@ -1,2 +1,2 @@ warn("Requiring 'webrat/rspec-rails' is deprecated. Please require 'webrat/integrations/rspec-rails' instead") -require "webrat/integrations/rspec-rails" \ No newline at end of file +require "webrat/integrations/rspec-rails" diff --git a/lib/webrat/selenium/application_servers.rb b/lib/webrat/selenium/application_servers.rb index cd0234be..458a1596 100644 --- a/lib/webrat/selenium/application_servers.rb +++ b/lib/webrat/selenium/application_servers.rb @@ -2,4 +2,4 @@ require "webrat/selenium/application_servers/sinatra" require "webrat/selenium/application_servers/merb" require "webrat/selenium/application_servers/rails" -require "webrat/selenium/application_servers/external" \ No newline at end of file +require "webrat/selenium/application_servers/external" diff --git a/lib/webrat/selenium/application_servers/external.rb b/lib/webrat/selenium/application_servers/external.rb index 787ef487..84b3e4c4 100644 --- a/lib/webrat/selenium/application_servers/external.rb +++ b/lib/webrat/selenium/application_servers/external.rb @@ -23,4 +23,4 @@ def wait end end end -end \ No newline at end of file +end diff --git a/lib/webrat/selenium/selenium_rc_server.rb b/lib/webrat/selenium/selenium_rc_server.rb index b38724da..ecc00404 100644 --- a/lib/webrat/selenium/selenium_rc_server.rb +++ b/lib/webrat/selenium/selenium_rc_server.rb @@ -74,8 +74,8 @@ def fail def stop silence_stream(STDOUT) do - ::Selenium::RemoteControl::RemoteControl.new("0.0.0.0", - Webrat.configuration.selenium_server_port, + ::Selenium::RemoteControl::RemoteControl.new("0.0.0.0", + Webrat.configuration.selenium_server_port, :timeout => 5).stop end end diff --git a/lib/webrat/selenium/silence_stream.rb b/lib/webrat/selenium/silence_stream.rb index 0c724ab1..e1e6c74e 100644 --- a/lib/webrat/selenium/silence_stream.rb +++ b/lib/webrat/selenium/silence_stream.rb @@ -15,4 +15,4 @@ def silence_stream(stream) end end end -end \ No newline at end of file +end diff --git a/spec/integration/rails/test/integration/button_click_test.rb b/spec/integration/rails/test/integration/button_click_test.rb index f983faec..1bf46274 100644 --- a/spec/integration/rails/test/integration/button_click_test.rb +++ b/spec/integration/rails/test/integration/button_click_test.rb @@ -77,4 +77,4 @@ class ButtonClickTest < ActionController::IntegrationTest click_button "input_image_alt" end -end \ No newline at end of file +end diff --git a/spec/integration/rails/test/integration/fill_in_test.rb b/spec/integration/rails/test/integration/fill_in_test.rb index 530c7e75..6620ce60 100644 --- a/spec/integration/rails/test/integration/fill_in_test.rb +++ b/spec/integration/rails/test/integration/fill_in_test.rb @@ -21,4 +21,4 @@ class FillInTest < ActionController::IntegrationTest visit fields_path fill_in "[Field]:", :with => "value" end -end \ No newline at end of file +end diff --git a/spec/integration/rails/test/integration/link_click_test.rb b/spec/integration/rails/test/integration/link_click_test.rb index eb3810fe..5c143a59 100644 --- a/spec/integration/rails/test/integration/link_click_test.rb +++ b/spec/integration/rails/test/integration/link_click_test.rb @@ -24,4 +24,4 @@ class LinkClickTest < ActionController::IntegrationTest click_link "Link With (parens)" assert_contain("Link:link_with_parens") end -end \ No newline at end of file +end diff --git a/spec/public/fill_in_spec.rb b/spec/public/fill_in_spec.rb index 8e9cb7be..cb5097b9 100644 --- a/spec/public/fill_in_spec.rb +++ b/spec/public/fill_in_spec.rb @@ -15,7 +15,7 @@ fill_in "User Text", :with => "filling text area" click_button end - + it "should support multiline values" do with_html <<-HTML diff --git a/spec/public/matchers/have_selector_spec.rb b/spec/public/matchers/have_selector_spec.rb index 46f64527..a491ea97 100644 --- a/spec/public/matchers/have_selector_spec.rb +++ b/spec/public/matchers/have_selector_spec.rb @@ -61,7 +61,7 @@ @body.should have_selector("li", :count => 4) }.should raise_error(Spec::Expectations::ExpectationNotMetError) end - + it "should convert a string to an integer for count" do @body.should have_selector("li", :count => "3") end