RubyGems - diabolo-webrat - Versions diffs - 0.4.4.2 → 0.5.1 - Mend

diabolo-webrat 0.4.4.2 → 0.5.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (148) hide show

data/.document +4 -0
data/.gitignore +15 -0
data/History.txt +60 -9
data/Rakefile +90 -75
data/VERSION +1 -0
data/lib/webrat.rb +8 -23
data/lib/webrat/{mechanize.rb → adapters/mechanize.rb} +6 -2
data/lib/webrat/adapters/merb.rb +11 -0
data/lib/webrat/adapters/rack.rb +25 -0
data/lib/webrat/{rails.rb → adapters/rails.rb} +9 -18
data/lib/webrat/adapters/sinatra.rb +9 -0
data/lib/webrat/core.rb +0 -1
data/lib/webrat/core/configuration.rb +7 -17
data/lib/webrat/core/elements/area.rb +2 -2
data/lib/webrat/core/elements/element.rb +3 -3
data/lib/webrat/core/elements/field.rb +33 -30
data/lib/webrat/core/elements/form.rb +4 -4
data/lib/webrat/core/elements/label.rb +4 -4
data/lib/webrat/core/elements/link.rb +7 -6
data/lib/webrat/core/elements/select_option.rb +2 -2
data/lib/webrat/core/locators.rb +1 -1
data/lib/webrat/core/locators/area_locator.rb +3 -3
data/lib/webrat/core/locators/button_locator.rb +6 -6
data/lib/webrat/core/locators/field_by_id_locator.rb +3 -3
data/lib/webrat/core/locators/field_labeled_locator.rb +2 -2
data/lib/webrat/core/locators/field_named_locator.rb +3 -3
data/lib/webrat/core/locators/form_locator.rb +1 -1
data/lib/webrat/core/locators/label_locator.rb +2 -2
data/lib/webrat/core/locators/link_locator.rb +20 -12
data/lib/webrat/core/locators/select_option_locator.rb +5 -5
data/lib/webrat/core/logging.rb +1 -1
data/lib/webrat/core/matchers/have_content.rb +2 -7
data/lib/webrat/core/matchers/have_xpath.rb +2 -27
data/lib/webrat/core/methods.rb +4 -4
data/lib/webrat/core/mime.rb +11 -22
data/lib/webrat/core/save_and_open_page.rb +5 -7
data/lib/webrat/core/scope.rb +2 -2
data/lib/webrat/core/session.rb +30 -14
data/lib/webrat/core/xml.rb +41 -84
data/lib/webrat/integrations/merb.rb +10 -0
data/lib/webrat/integrations/rails.rb +9 -0
data/lib/webrat/integrations/rspec-rails.rb +10 -0
data/lib/webrat/integrations/selenium.rb +11 -0
data/lib/webrat/rspec-rails.rb +2 -13
data/lib/webrat/selenium.rb +0 -11
data/lib/webrat/selenium/application_server_factory.rb +40 -0
data/lib/webrat/selenium/application_servers.rb +5 -0
data/lib/webrat/selenium/application_servers/base.rb +46 -0
data/lib/webrat/selenium/application_servers/external.rb +26 -0
data/lib/webrat/selenium/application_servers/merb.rb +50 -0
data/lib/webrat/selenium/application_servers/rails.rb +44 -0
data/lib/webrat/selenium/application_servers/sinatra.rb +37 -0
data/lib/webrat/selenium/location_strategy_javascript/label.js +2 -1
data/lib/webrat/selenium/selenium_rc_server.rb +7 -5
data/lib/webrat/selenium/selenium_session.rb +20 -7
data/lib/webrat/selenium/silence_stream.rb +1 -1
data/spec/fakes/{test_session.rb → test_adapter.rb} +6 -3
data/spec/integration/mechanize/Rakefile +7 -0
data/spec/integration/mechanize/config.ru +2 -0
data/spec/integration/mechanize/sample_app.rb +20 -0
data/spec/integration/mechanize/spec/mechanize_spec.rb +22 -0
data/spec/integration/mechanize/spec/spec_helper.rb +27 -0
data/spec/integration/merb/.gitignore +21 -0
data/spec/integration/merb/Rakefile +35 -0
data/spec/integration/merb/app/controllers/testing.rb +9 -0
data/spec/integration/merb/app/views/exceptions/not_acceptable.html.erb +63 -0
data/spec/integration/merb/app/views/exceptions/not_found.html.erb +47 -0
data/spec/integration/merb/app/views/layout/application.html.erb +12 -0
data/spec/integration/merb/app/views/testing/show_form.html.erb +27 -0
data/spec/integration/merb/app/views/testing/upload.html.erb +9 -0
data/spec/integration/merb/config/router.rb +1 -0
data/spec/integration/merb/spec/spec.opts +1 -0
data/spec/integration/merb/spec/spec_helper.rb +2 -0
data/spec/integration/merb/spec/webrat_spec.rb +7 -0
data/spec/integration/merb/tasks/merb.thor/main.thor +150 -0
data/spec/integration/rack/Rakefile +5 -0
data/spec/integration/rack/app.rb +89 -0
data/spec/integration/rack/test/helper.rb +21 -0
data/spec/integration/rack/test/webrat_rack_test.rb +57 -51
data/spec/integration/rails/.gitignore +3 -0
data/spec/integration/rails/Rakefile +30 -0
data/spec/integration/rails/app/controllers/webrat_controller.rb +13 -9
data/spec/integration/rails/app/views/buttons/show.html.erb +11 -0
data/spec/integration/rails/app/views/fields/show.html.erb +9 -0
data/spec/integration/rails/app/views/links/show.html.erb +5 -0
data/spec/integration/rails/app/views/webrat/before_redirect_form.html.erb +4 -0
data/spec/integration/rails/app/views/webrat/buttons.html.erb +11 -0
data/spec/integration/rails/app/views/webrat/form.html.erb +28 -0
data/spec/integration/rails/config/locales/en.yml +5 -0
data/spec/integration/rails/config/routes.rb +1 -0
data/spec/integration/rails/public/404.html +30 -0
data/spec/integration/rails/public/422.html +30 -0
data/spec/integration/rails/public/500.html +33 -0
data/spec/integration/rails/script/about +4 -0
data/spec/integration/rails/script/console +3 -0
data/spec/integration/rails/script/dbconsole +3 -0
data/spec/integration/rails/script/destroy +3 -0
data/spec/integration/rails/script/generate +3 -0
data/spec/integration/rails/script/performance/benchmarker +3 -0
data/spec/integration/rails/script/performance/profiler +3 -0
data/spec/integration/rails/script/performance/request +3 -0
data/spec/integration/rails/script/plugin +3 -0
data/spec/integration/rails/script/process/inspector +3 -0
data/spec/integration/rails/script/process/reaper +3 -0
data/spec/integration/rails/script/process/spawner +3 -0
data/spec/integration/rails/script/runner +3 -0
data/spec/integration/rails/script/server +3 -0
data/spec/integration/rails/test/integration/button_click_test.rb +2 -2
data/spec/integration/rails/test/integration/link_click_test.rb +7 -1
data/spec/integration/rails/test/integration/webrat_test.rb +22 -0
data/spec/integration/rails/test/test_helper.rb +6 -5
data/spec/integration/sinatra/Rakefile +5 -0
data/spec/integration/sinatra/test/test_helper.rb +3 -2
data/spec/private/core/configuration_spec.rb +8 -27
data/spec/private/core/field_spec.rb +7 -7
data/spec/private/core/link_spec.rb +1 -1
data/spec/private/core/session_spec.rb +23 -21
data/spec/private/mechanize/{mechanize_session_spec.rb → mechanize_adapter_spec.rb} +4 -12
data/spec/private/nokogiri_spec.rb +2 -2
data/spec/private/rails/{rails_session_spec.rb → rails_adapter_spec.rb} +16 -16
data/spec/private/selenium/application_servers/rails_spec.rb +26 -0
data/spec/public/matchers/contain_spec.rb +4 -4
data/spec/public/matchers/have_selector_spec.rb +2 -2
data/spec/public/matchers/have_xpath_spec.rb +3 -3
data/spec/public/save_and_open_spec.rb +25 -6
data/spec/public/selenium/application_server_factory_spec.rb +49 -0
data/spec/public/selenium/application_servers/external_spec.rb +12 -0
data/spec/public/selenium/selenium_session_spec.rb +37 -0
data/spec/rcov.opts +1 -0
data/spec/spec.opts +2 -0
data/spec/spec_helper.rb +5 -1
data/vendor/selenium-server.jar +0 -0
data/webrat.gemspec +348 -0
metadata +176 -23
data/lib/webrat/core/xml/hpricot.rb +0 -19
data/lib/webrat/core/xml/nokogiri.rb +0 -76
data/lib/webrat/core/xml/rexml.rb +0 -24
data/lib/webrat/merb_session.rb +0 -65
data/lib/webrat/rack.rb +0 -24
data/lib/webrat/rack_test.rb +0 -32
data/lib/webrat/selenium/application_server.rb +0 -73
data/lib/webrat/selenium/merb_application_server.rb +0 -48
data/lib/webrat/selenium/rails_application_server.rb +0 -42
data/lib/webrat/selenium/sinatra_application_server.rb +0 -35
data/lib/webrat/sinatra.rb +0 -44
data/spec/integration/rack/rack_app.rb +0 -16
data/spec/integration/rack/test/test_helper.rb +0 -20
data/spec/private/merb/merb_session_spec.rb +0 -42

data/spec/integration/sinatra/Rakefile ADDED Viewed

@@ -0,0 +1,5 @@
+require "rake/testtask"
+Rake::TestTask.new do |t|
+  t.test_files = FileList["test/*_test.rb"]
+end

data/spec/integration/sinatra/test/test_helper.rb CHANGED Viewed

@@ -1,8 +1,9 @@
 require "rubygems"
 require "test/unit"
-require "redgreen"
+# require "redgreen"
-require File.dirname(__FILE__) + "/../../../../lib/webrat"
+$LOAD_PATH.unshift File.dirname(__FILE__) + "/../../../../lib"
+require "webrat"
 Webrat.configure do |config|
   config.mode = :sinatra

data/spec/private/core/configuration_spec.rb CHANGED Viewed

@@ -1,16 +1,15 @@
 require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 describe Webrat::Configuration do
-  predicate_matchers[:parse_with_nokogiri]  = :parse_with_nokogiri?
-  predicate_matchers[:open_error_files]     = :open_error_files?
-  it "should have a mode" do
-    Webrat.configuration.should respond_to(:mode)
+  Spec::Matchers.define :open_error_files do
+    match do |config|
+      config.open_error_files?
+    end
   end
-  it "should use Nokogiri as the parser by default" do
-    config = Webrat::Configuration.new
-    config.should parse_with_nokogiri
+  it "should have a mode" do
+    Webrat.configuration.should respond_to(:mode)
   end
   it "should open error files by default" do
@@ -46,24 +45,6 @@ describe Webrat::Configuration do
     config.selenium_server_port.should == 1234
   end
-  [:rails,
-  :selenium,
-  :rack,
-  :sinatra,
-  :mechanize].each do |mode|
-    it "should require correct lib when in #{mode} mode" do
-      config = Webrat::Configuration.new
-      config.should_receive(:require).with("webrat/#{mode}")
-      config.mode = mode
-    end
-  end
-  it "should require merb_session when in merb mode" do
-    config = Webrat::Configuration.new
-    config.should_receive(:require).with("webrat/merb_session")
-    config.mode = :merb
-  end
   describe "Selenium" do
     before :each do
       @config = Webrat::Configuration.new
@@ -92,11 +73,11 @@ describe Webrat::Configuration do
     it 'should default selenium browser key to *firefox' do
       @config.selenium_browser_key.should == '*firefox'
     end
     it 'should default selenium browser startup timeout to 5 seconds' do
       @config.selenium_browser_startup_timeout.should == 5
     end
     it 'should allow overriding of the browser startup timeout' do
       @config.selenium_browser_startup_timeout = 10
       @config.selenium_browser_startup_timeout.should == 10

data/spec/private/core/field_spec.rb CHANGED Viewed

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 module Webrat
   describe Field do
-    unless Webrat.on_java?
+    unless RUBY_PLATFORM =~ /java/
       it "should have nice inspect output" do
         html = <<-HTML
           <html>
@@ -10,7 +10,7 @@ module Webrat
           </html>
         HTML
-        element = Webrat::XML.css_search(Webrat::XML.document(html), "input").first
+        element = Webrat::XML.document(html).css("input").first
         checkbox = CheckboxField.new(nil, element)
         checkbox.inspect.should =~ /#<Webrat::CheckboxField @element=<input type=['"]checkbox['"] checked(=['"]checked['"])?\/?>>/
       end
@@ -25,7 +25,7 @@ module Webrat
         </html>
       HTML
-      element = Webrat::XML.css_search(Webrat::XML.document(html), "input").first
+      element = Webrat::XML.document(html).css("input").first
       checkbox = CheckboxField.new(nil, element)
       checkbox.should be_checked
     end
@@ -37,7 +37,7 @@ module Webrat
         </html>
       HTML
-      element = Webrat::XML.css_search(Webrat::XML.document(html), "input").first
+      element = Webrat::XML.document(html).css("input").first
       checkbox = CheckboxField.new(nil, element)
       checkbox.should_not be_checked
     end
@@ -51,7 +51,7 @@ module Webrat
         </html>
       HTML
-      element = Webrat::XML.css_search(Webrat::XML.document(html), "input").first
+      element = Webrat::XML.document(html).css("input").first
       radio_button = RadioField.new(nil, element)
       radio_button.should be_checked
     end
@@ -61,7 +61,7 @@ module Webrat
         <html><input type='radio' /></html>
       HTML
-      element = Webrat::XML.css_search(Webrat::XML.document(html), "input").first
+      element = Webrat::XML.document(html).css("input").first
       radio_button = RadioField.new(nil, element)
       radio_button.should_not be_checked
     end
@@ -77,7 +77,7 @@ module Webrat
         </html>
       HTML
-      element    = Webrat::XML.css_search(Webrat::XML.document(html), 'input').first
+      element    = Webrat::XML.document(html).css('input').first
       text_field = TextField.new(nil, element)
       text_field.to_param.should == { 'email' => 'user@example.com' }
     end

data/spec/private/core/link_spec.rb CHANGED Viewed

@@ -4,7 +4,7 @@ describe Webrat::Link do
 #  include Webrat::Link
   before do
-    webrat_session = mock(Webrat::TestSession)
+    webrat_session = mock(Webrat::TestAdapter)
     @link_text_with_nbsp = 'Link' + [0xA0].pack("U") + 'Text'
   end

data/spec/private/core/session_spec.rb CHANGED Viewed

@@ -21,27 +21,6 @@ describe Webrat::Session do
     session.should respond_to(:current_dom)
   end
-  it "should open the page in the browser in MacOSX" do
-    session = Webrat::Session.new
-    session.stub!(:ruby_platform => 'darwin')
-    session.should_receive(:`).with("open path")
-    session.open_in_browser("path")
-  end
-  it "should open the page in the browser in cygwin" do
-    session = Webrat::Session.new
-    session.stub!(:ruby_platform => 'i386-cygwin')
-    session.should_receive(:`).with("rundll32 url.dll,FileProtocolHandler path\\to\\file")
-    session.open_in_browser("path/to/file")
-  end
-  it "should open the page in the browser in Win32" do
-    session = Webrat::Session.new
-    session.stub!(:ruby_platform => 'win32')
-    session.should_receive(:`).with("rundll32 url.dll,FileProtocolHandler path\\to\\file")
-    session.open_in_browser("path/to/file")
-  end
   it "should provide a current_page for backwards compatibility" do
     session = Webrat::Session.new
     current_page = session.current_page
@@ -83,6 +62,11 @@ describe Webrat::Session do
     it "should raise an error if a symbol Mime type is passed that does not exist" do
       lambda { webrat_session.http_accept(:oogabooga) }.should raise_error(ArgumentError)
     end
+    it "should recognize a couple of webrat-specific formats" do
+      webrat_session.http_accept(:multipart_form).should == "multipart/form-data"
+      webrat_session.http_accept(:url_encoded_form).should == "application/x-www-form-urlencoded"
+    end
   end
   describe "#request_page" do
@@ -127,6 +111,24 @@ describe Webrat::Session do
       webrat_session = Webrat::Session.new
     end
+    it "should return true if the last response was a redirect and Fixnum#/ returns a Rational" do
+      # This happens if the ruby-units gem has been required
+      Fixnum.class_eval do
+        alias_method :original_divide, "/".to_sym
+        def /(other)
+          Rational(self, other)
+        end
+      end
+      webrat_session.stub!(:response_code => 301)
+      webrat_session.redirect?.should be_true
+      Fixnum.class_eval do
+        alias_method "/".to_sym, :original_divide
+      end
+    end
     it "should return true if the last response was a redirect" do
       webrat_session.stub!(:response_code => 301)
       webrat_session.redirect?.should be_true

data/spec/private/mechanize/{mechanize_session_spec.rb → mechanize_adapter_spec.rb} RENAMED Viewed

@@ -1,20 +1,12 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
-require "webrat/mechanize"
-describe Webrat::MechanizeSession do
+describe Webrat::MechanizeAdapter do
   before :each do
     Webrat.configuration.mode = :mechanize
   end
   before(:each) do
-    @mech = Webrat::MechanizeSession.new
-  end
-  describe "headers method" do
-    it "should return empty headers for a newly initialized session" do
-      @mech.headers.should == {}
-    end
+    @mech = Webrat::MechanizeAdapter.new
   end
   describe "post" do
@@ -34,13 +26,13 @@ describe Webrat::MechanizeSession do
       mechanize = mock(:mechanize)
       WWW::Mechanize.stub!(:new => mechanize)
       mechanize.should_receive(:post).with(url, flattened_data)
-      Webrat::MechanizeSession.new.post(url, data)
+      Webrat::MechanizeAdapter.new.post(url, data)
     end
   end
   describe "#absolute_url" do
     before(:each) do
-      @session = Webrat::MechanizeSession.new
+      @session = Webrat::MechanizeAdapter.new
       @session.stub!(:current_url).and_return(absolute_url)
     end

data/spec/private/nokogiri_spec.rb CHANGED Viewed

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
-if defined?(Nokogiri::XML) && Webrat.configuration.parse_with_nokogiri?
+# if defined?(Nokogiri::XML) && Webrat.configuration.parse_with_nokogiri?
   describe "Nokogiri Extension" do
     include Webrat::Matchers
@@ -74,4 +74,4 @@ if defined?(Nokogiri::XML) && Webrat.configuration.parse_with_nokogiri?
       end
     end
   end
-end
+# end

data/spec/private/rails/{rails_session_spec.rb → rails_adapter_spec.rb} RENAMED Viewed

@@ -1,8 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
-require "webrat/rails"
-describe Webrat::RailsSession do
+describe Webrat::RailsAdapter do
   before :each do
     Webrat.configuration.mode = :rails
     @integration_session = mock("integration_session")
@@ -10,35 +8,35 @@ describe Webrat::RailsSession do
   it "should delegate response_body to the session response body" do
     @integration_session.stub!(:response => mock("response", :body => "<html>"))
-    Webrat::RailsSession.new(@integration_session).response_body.should == "<html>"
+    Webrat::RailsAdapter.new(@integration_session).response_body.should == "<html>"
   end
   it "should delegate response_code to the session response code" do
     @integration_session.stub!(:response => mock("response", :code => "42"))
-    Webrat::RailsSession.new(@integration_session).response_code.should == 42
+    Webrat::RailsAdapter.new(@integration_session).response_code.should == 42
   end
   it "should delegate get to the integration session" do
     @integration_session.should_receive(:get).with("url", "data", "headers")
-    rails_session = Webrat::RailsSession.new(@integration_session)
+    rails_session = Webrat::RailsAdapter.new(@integration_session)
     rails_session.get("url", "data", "headers")
   end
   it "should delegate post to the integration session" do
     @integration_session.should_receive(:post).with("url", "data", "headers")
-    rails_session = Webrat::RailsSession.new(@integration_session)
+    rails_session = Webrat::RailsAdapter.new(@integration_session)
     rails_session.post("url", "data", "headers")
   end
   it "should delegate put to the integration session" do
     @integration_session.should_receive(:put).with("url", "data", "headers")
-    rails_session = Webrat::RailsSession.new(@integration_session)
+    rails_session = Webrat::RailsAdapter.new(@integration_session)
     rails_session.put("url", "data", "headers")
   end
   it "should delegate delete to the integration session" do
     @integration_session.should_receive(:delete).with("url", "data", "headers")
-    rails_session = Webrat::RailsSession.new(@integration_session)
+    rails_session = Webrat::RailsAdapter.new(@integration_session)
     rails_session.delete("url", "data", "headers")
   end
@@ -46,7 +44,7 @@ describe Webrat::RailsSession do
     it "should pass the full url" do
       @integration_session.stub!(:https!)
       @integration_session.should_receive(:get).with("http://www.example.com/url", "data", "headers")
-      rails_session = Webrat::RailsSession.new(@integration_session)
+      rails_session = Webrat::RailsAdapter.new(@integration_session)
       rails_session.get("http://www.example.com/url", "data", "headers")
     end
   end
@@ -55,7 +53,7 @@ describe Webrat::RailsSession do
     it "should call #https! with true before the request before passing along the full url" do
       @integration_session.should_receive(:https!).with(true)
       @integration_session.should_receive(:get).with("https://www.example.com/url", "data", "headers")
-      rails_session = Webrat::RailsSession.new(@integration_session)
+      rails_session = Webrat::RailsAdapter.new(@integration_session)
       rails_session.get("https://www.example.com/url", "data", "headers")
     end
   end
@@ -64,7 +62,7 @@ describe Webrat::RailsSession do
     it "should call #https! with true before the request" do
       @integration_session.stub!(:get)
       @integration_session.should_receive(:https!).with(false)
-      rails_session = Webrat::RailsSession.new(@integration_session)
+      rails_session = Webrat::RailsAdapter.new(@integration_session)
       rails_session.get("http://www.example.com/url", "data", "headers")
     end
   end
@@ -73,20 +71,22 @@ describe Webrat::RailsSession do
     it "should strip out the anchor" do
       @integration_session.should_receive(:https!).with(false)
       @integration_session.should_receive(:get).with("http://www.example.com/url", "data", "headers")
-      rails_session = Webrat::RailsSession.new(@integration_session)
+      rails_session = Webrat::RailsAdapter.new(@integration_session)
       rails_session.get("http://www.example.com/url#foo", "data", "headers")
     end
   end
   it "should provide a saved_page_dir" do
-    Webrat::RailsSession.new(mock("integration session")).should respond_to(:saved_page_dir)
+    Webrat::RailsAdapter.new(mock("integration session")).should respond_to(:saved_page_dir)
   end
   it "should provide a doc_root" do
-    Webrat::RailsSession.new(mock("integration session")).should respond_to(:doc_root)
+    Webrat::RailsAdapter.new(mock("integration session")).should respond_to(:doc_root)
   end
   it "should accept an ActiveRecord argument to #within and translate to a selector using dom_id" do
+    pending "Move this to spec/public/within_spec.rb"
     body = <<-HTML
       <a href="/page1">Edit</a>
       <div id="new_object">
@@ -98,7 +98,7 @@ describe Webrat::RailsSession do
     @integration_session.stub!(:response => response)
     @integration_session.should_receive(:get).with("/page2", {}, nil)
-    rails_session = Webrat::RailsSession.new(@integration_session)
+    rails_session = Webrat::RailsAdapter.new(@integration_session)
     object = Object.new
     object.stub!(:id => nil)

data/spec/private/selenium/application_servers/rails_spec.rb ADDED Viewed

@@ -0,0 +1,26 @@
+require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper")
+require "webrat/selenium/application_servers/rails"
+RAILS_ROOT = "." unless defined?(RAILS_ROOT)
+describe Webrat::Selenium::ApplicationServers::Rails do
+  include Webrat::Selenium::SilenceStream
+  before do
+    @server = Webrat::Selenium::ApplicationServers::Rails.new
+    # require "rubygems"; require "ruby-debug"; Debugger.start; debugger
+    @server.stub!(:system)
+    @server.stub!(:at_exit)
+  end
+  describe "boot" do
+    it "should wait for the server to start on 0.0.0.0" do
+      TCPSocket.should_receive(:wait_for_service_with_timeout).
+        with(hash_including(:host => "0.0.0.0"))
+      silence_stream(STDERR) do
+        @server.boot
+      end
+    end
+  end
+end

data/spec/public/matchers/contain_spec.rb CHANGED Viewed

@@ -56,13 +56,13 @@ describe "contain" do
       it "should throw an exception when the body doesnt contain the text" do
         lambda {
           assert_contain("monkeys")
-        }.should raise_error(Test::Unit::AssertionFailedError)
+        }.should raise_error(AssertionFailedError)
       end
       it "should throw an exception when the body doesnt contain the regexp" do
         lambda {
           assert_contain(/monkeys/)
-        }.should raise_error(Test::Unit::AssertionFailedError)
+        }.should raise_error(AssertionFailedError)
       end
     end
@@ -78,13 +78,13 @@ describe "contain" do
       it "should throw an exception when the body does contain the text" do
         lambda {
           assert_not_contain("hello, world")
-        }.should raise_error(Test::Unit::AssertionFailedError)
+        }.should raise_error(AssertionFailedError)
       end
       it "should throw an exception when the body does contain the regexp" do
         lambda {
           assert_not_contain(/hello, world/)
-        }.should raise_error(Test::Unit::AssertionFailedError)
+        }.should raise_error(AssertionFailedError)
       end
     end
   end

data/spec/public/matchers/have_selector_spec.rb CHANGED Viewed

@@ -122,7 +122,7 @@ describe "have_selector" do
       it "should throw an exception when the body doesnt have matching selection" do
         lambda {
           assert_have_selector("p")
-        }.should raise_error(Test::Unit::AssertionFailedError)
+        }.should raise_error(AssertionFailedError)
       end
     end
@@ -134,7 +134,7 @@ describe "have_selector" do
       it "should throw an exception when the body does contain the selection" do
         lambda {
           assert_have_no_selector("div")
-        }.should raise_error(Test::Unit::AssertionFailedError)
+        }.should raise_error(AssertionFailedError)
       end
     end
   end