@@ -21,6 +21,7 @@ module RspecShnork end def failure_message + max_messages = 5 msg = <<-EOM Shnork found #{messages_to_string(404)} and #{messages_to_string(500)}. One or both of these are over the accepted thresholds (404 -> #{@thresholds[404]}, 500 -> #{@thresholds[500]}). @@ -28,8 +29,9 @@ module RspecShnork [404, 500].each do |error| i = 0 if messages_for(error) > 0 then - msg += " First couple of #{error} errors:\n" - while i < 6 and i < messages_for(error) + show_errors = messages_for(error) < max_messages ? messages_for(error) : max_messages + msg += " First #{show_errors} discovered #{error} error#{ show_errors == 1 ? '' : 's'}:\n" + while i < max_messages and i < messages_for(error) msg += " * " + @results.codes[error][i] + "\n" i += 1 end lib/rspec_shnork_matchers.rb @@ -22,8 +22,8 @@ module Shnork attr_accessor :depth def initialize - Sinatra::Application.default_options[:run] = false - Sinatra::Application.default_options[:environment] = :production + set :env, :production + set :run, false @app = Sinatra::application @request = Rack::MockRequest.new(Sinatra.build_application) @reached = [] @@ -62,12 +62,8 @@ module Shnork @internal_depth[page] = from ? @internal_depth[from] + 1 : 0 @internal_pred[page] = from return unless less_than_max_depth @internal_depth[page] - begin @page = @request.get(page) @page = @request.get(@page.headers["Location"]) if @page.status >= 300 and @page.status < 400 - rescue - raise RuntimeError, "error while attempting to retrieve page #{page}" - end @results.add @page.status, page @found = @found | links(page) record page lib/shnork.rb @@ -5,6 +5,36 @@ get '/' do <<-EOM Hello World! <a href="/">Home</a> - <a href="/working-link/">Working Link</a> + <a href="/working-link">Working Link</a> + <a href="/working-link/1">Working Link</a> + <a href="/working-link/2">Working Link</a> + <a href="/working-link/3">Working Link</a> + <a href="/working-link/4">Working Link</a> + <a href="/working-link/5">Working Link</a> + <a href="/working-link/6">Working Link</a> EOM -end \ No newline at end of file +end + +get '/working-link' do + <<-EOM + This is a working page! + EOM +end + +get '/working-link/:number' do + <<-EOM + This is a working page! + Here is another: <a href='/working-link'>Working Link</a> + This is a broken link: <a href='/broken-link/#{params[:number]}'>Broken Link #{params[:number]}</a> + This link will cause a 500 error: <a href='/error/#{params[:number]}'>500 Error link #{params[:number]}</a> + EOM +end + +error do + "<h1>500</h1>" +end + +get '/error/:number' do + throw :halt, [500, 'error'] +end + spec/site.rb f9c5a208031d603c348a34003abc76313633927b Ardekantur greystone@ardekantur.com http://github.com/ardekantur/shnork/commit/bcebf4750d07564d34ddcafbdc4151a01ff20577 bcebf4750d07564d34ddcafbdc4151a01ff20577 2008-11-25T18:13:56-08:00 2008-11-25T18:13:56-08:00 more intelligent rspec matcher messages e25240c077b3fafb3986055a4c3d528c81ebf377 Ardekantur greystone@ardekantur.com