rack-perftools_profiler 0.5.0 → 0.5.1

data/lib/rack/perftools_profiler/version.rb

@@ -0,0 +1,5 @@
+module Rack
+  module PerftoolsProfiler
+    VERSION = "0.5.1"
+  end
+end

data/rack-perftools_profiler.gemspec

@@ -1,76 +1,33 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "rack/perftools_profiler/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{rack-perftools_profiler}
-  s.version = "0.5.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Ben Brinckerhoff"]
-  s.date = %q{2011-07-25}
+  s.name        = "rack-perftools_profiler"
+  s.version     = Rack::PerftoolsProfiler::VERSION
+  s.authors     = ["Ben Brinckerhoff"]
+  s.email       = ["ben@bbrinck.com"]
+  s.homepage    = "http://github.com/bhb/rack-perftools_profiler"
+  s.summary     = %q{Middleware for profiling Rack-compatible apps using perftools.rb}
   s.description = %q{Middleware for profiling Rack-compatible apps using perftools.rb}
-  s.email = %q{ben@bbrinck.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    "LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "lib/rack/perftools_profiler.rb",
-    "lib/rack/perftools_profiler/action.rb",
-    "lib/rack/perftools_profiler/call_app_directly.rb",
-    "lib/rack/perftools_profiler/profile_data_action.rb",
-    "lib/rack/perftools_profiler/profile_once.rb",
-    "lib/rack/perftools_profiler/profiler.rb",
-    "lib/rack/perftools_profiler/profiler_middleware.rb",
-    "lib/rack/perftools_profiler/return_data.rb",
-    "lib/rack/perftools_profiler/return_password_error.rb",
-    "lib/rack/perftools_profiler/start_profiling.rb",
-    "lib/rack/perftools_profiler/stop_profiling.rb",
-    "lib/rack/perftools_profiler/utils.rb",
-    "rack-perftools_profiler-0.4.1.gem",
-    "rack-perftools_profiler.gemspec",
-    "test/multiple_request_profiling_test.rb",
-    "test/rack-perftools-profiler_test.rb",
-    "test/single_request_profiling_test.rb",
-    "test/test_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/bhb/rack-perftools_profiler}
+
+  s.rubyforge_project = "rack-perftools_profiler"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Middleware for profiling Rack-compatible apps using perftools.rb}
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  # specify any dependencies here; for example:
+  # s.add_development_dependency "rspec"
+  # s.add_runtime_dependency "rest-client"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<perftools.rb>, ["~> 0.5.6"])
-      s.add_runtime_dependency(%q<rack>, ["~> 1.0"])
-      s.add_runtime_dependency(%q<open4>, ["~> 1.0"])
-      s.add_development_dependency(%q<rack>, ["~> 1.1"])
-      s.add_development_dependency(%q<shoulda>, ["~> 2.10"])
-      s.add_development_dependency(%q<mocha>, ["~> 0.9"])
-    else
-      s.add_dependency(%q<perftools.rb>, ["~> 0.5.6"])
-      s.add_dependency(%q<rack>, ["~> 1.0"])
-      s.add_dependency(%q<open4>, ["~> 1.0"])
-      s.add_dependency(%q<rack>, ["~> 1.1"])
-      s.add_dependency(%q<shoulda>, ["~> 2.10"])
-      s.add_dependency(%q<mocha>, ["~> 0.9"])
-    end
-  else
-    s.add_dependency(%q<perftools.rb>, ["~> 0.5.6"])
-    s.add_dependency(%q<rack>, ["~> 1.0"])
-    s.add_dependency(%q<open4>, ["~> 1.0"])
-    s.add_dependency(%q<rack>, ["~> 1.1"])
-    s.add_dependency(%q<shoulda>, ["~> 2.10"])
-    s.add_dependency(%q<mocha>, ["~> 0.9"])
-  end
-end
+  s.add_dependency 'perftools.rb', '~> 0.5.6'
+  s.add_dependency 'rack', '~> 1.0'
+  s.add_dependency('open4', '~> 1.0')
+  s.add_development_dependency 'rack', '~> 1.1'
+  s.add_development_dependency 'shoulda', '~> 2.10'
+  s.add_development_dependency 'mocha', '~> 0.9'
+  s.add_development_dependency 'rake',  '~> 0.9.2'
 
+end

data/test/multiple_request_profiling_test.rb

@@ -8,14 +8,14 @@ class MultipleRequestProfilingTest < Test::Unit::TestCase
     @start_env = Rack::MockRequest.env_for('/__start__')
     @stop_env = Rack::MockRequest.env_for('/__stop__')
     @data_env = Rack::MockRequest.env_for('/__data__')
-    @root_request_env = Rack::MockRequest.env_for("/")    
+    @root_request_env = Rack::MockRequest.env_for("/")
   end
 
   def profile(profiled_app, options = {})
     start = options.fetch(:start) { @start_env }
     stop = options.fetch(:stop) { @stop_env }
     data = options.fetch(:data) { @data_env }
-    
+
     profiled_app.call(start) if start != :none
     if block_given?
       yield profiled_app
@@ -116,7 +116,8 @@ class MultipleRequestProfilingTest < Test::Unit::TestCase
     should "allow 'printer' param to override :default_printer option'" do
       profiled_app = Rack::PerftoolsProfiler.new(@app, :default_printer => 'pdf')
       custom_data_env = Rack::MockRequest.env_for('__data__', :params => 'printer=gif')
-      _, headers, _ = profile(profiled_app, :data => custom_data_env)
+      status, headers, body = profile(profiled_app, :data => custom_data_env)
+      assert_ok status, body
       assert_equal 'image/gif', headers['Content-Type']
     end
 
@@ -154,7 +155,7 @@ class MultipleRequestProfilingTest < Test::Unit::TestCase
     end
 
     context "when in bundler mode" do
-      
+
       should "call pprof.rb using 'bundle' command if bundler is set" do
         status = stub_everything(:exitstatus => 0)
         profiled_app = Rack::PerftoolsProfiler.new(@app, :bundler => true)
@@ -173,7 +174,7 @@ class MultipleRequestProfilingTest < Test::Unit::TestCase
         Dir.expects(:chdir).with('.').returns(["","",0])
         profile(profiled_app)
       end
-      
+
     end
 
     context "when the nodefraction parameter is specified" do
@@ -239,11 +240,11 @@ class MultipleRequestProfilingTest < Test::Unit::TestCase
         profiled_app = Rack::PerftoolsProfiler.new(app, :mode => :cputime)
         modified_start_env = Rack::MockRequest.env_for('/__start__', :params => 'mode=objects')
         profile(profiled_app, :start => modified_start_env, :data => :none)
-        
+
         assert_equal '1', objects
 
         profile(profiled_app, :data => :none)
-        
+
         assert_nil objects
       end
 
@@ -256,7 +257,7 @@ class MultipleRequestProfilingTest < Test::Unit::TestCase
         status, _, body = profiled_app.call(modified_start_env)
 
         assert_equal 400, status
-        assert_match(/Cannot change mode to '#{mode}'.\nPer-request mode changes are only available for the following modes: 'methods', 'objects'/, 
+        assert_match(/Cannot change mode to '#{mode}'.\nPer-request mode changes are only available for the following modes: 'methods', 'objects'/,
                      RackResponseBody.new(body).to_s)
       end
 
@@ -269,7 +270,7 @@ class MultipleRequestProfilingTest < Test::Unit::TestCase
         status, _, body = profiled_app.call(modified_start_env)
 
         assert_equal 400, status
-        assert_match(/Cannot change mode to '#{mode}'.\nPer-request mode changes are only available for the following modes: 'methods', 'objects'/, 
+        assert_match(/Cannot change mode to '#{mode}'.\nPer-request mode changes are only available for the following modes: 'methods', 'objects'/,
                      RackResponseBody.new(body).to_s)
       end
 
@@ -282,12 +283,12 @@ class MultipleRequestProfilingTest < Test::Unit::TestCase
         status, _, body = profiled_app.call(modified_start_env)
 
         assert_equal 400, status
-        assert_match(/Cannot change mode to '#{mode}'.\nPer-request mode changes are only available for the following modes: 'methods', 'objects'/, 
+        assert_match(/Cannot change mode to '#{mode}'.\nPer-request mode changes are only available for the following modes: 'methods', 'objects'/,
                      RackResponseBody.new(body).to_s)
       end
 
     end
-    
+
   end
 
   context 'when profiling is enabled' do
@@ -311,8 +312,8 @@ class MultipleRequestProfilingTest < Test::Unit::TestCase
       profiled_app = Rack::PerftoolsProfiler.new(app, :default_printer => 'text')
       profiled_app.call(@start_env)
       profiled_app.call(env)
-      # I used to clone the environment to avoid conflicts, but this seems to break 
-      # Devise/Warden. 
+      # I used to clone the environment to avoid conflicts, but this seems to break
+      # Devise/Warden.
       # assert_equal env, old_env
     end
 
@@ -327,8 +328,8 @@ class MultipleRequestProfilingTest < Test::Unit::TestCase
       profiled_app = Rack::PerftoolsProfiler.new(app, :default_printer => 'text')
       profiled_app.call(@start_env)
       profiled_app.call(env)
-      # I used to clone the environment to avoid conflicts, but this seems to break 
-      # Devise/Warden. 
+      # I used to clone the environment to avoid conflicts, but this seems to break
+      # Devise/Warden.
       # assert_equal env, old_env
     end
 
@@ -353,7 +354,7 @@ class MultipleRequestProfilingTest < Test::Unit::TestCase
     end
 
   end
-  
+
   should 'keeps data from multiple calls' do
     profiled_app = Rack::PerftoolsProfiler.with_profiling_off(TestApp.new, :default_printer => 'text', :mode => 'walltime')
     status, headers, body = profile(profiled_app) do |app|
@@ -364,4 +365,103 @@ class MultipleRequestProfilingTest < Test::Unit::TestCase
     assert_match(/method2/, RackResponseBody.new(body).to_s)
   end
 
+  context "when a profile password is required" do
+
+    should "call app directly on normal calls if password not provided" do
+      profiled_app = Rack::PerftoolsProfiler.with_profiling_off(@app, :password => 'secret')
+      profiled_app.call(@start_env)
+      status, headers, body = profiled_app.call(@root_request_env)
+      assert_equal 200, status
+      assert_equal 'text/plain', headers['Content-Type']
+      assert_equal 'Oh hai der', RackResponseBody.new(body).to_s
+    end
+
+    should "call __start__ if password is provided" do
+      profiled_app = Rack::PerftoolsProfiler.new(@app, :password => "secret")
+      actual_password = "secret"
+      start_env = Rack::MockRequest.env_for('/__start__', :params => "profile=#{actual_password}")
+      status, _, body = profiled_app.call(start_env)
+      assert_equal 200, status
+      assert_match(/Profiling is now enabled/, RackResponseBody.new(body).to_s)
+    end
+
+    should "call __stop__ if password is provided" do
+      profiled_app = Rack::PerftoolsProfiler.new(@app, :password => "secret")
+      actual_password = "secret"
+      stop_env = Rack::MockRequest.env_for('/__stop__', :params => "profile=#{actual_password}")
+      status, _, body = profiled_app.call(stop_env)
+      assert_equal 200, status
+      assert_match(/Profiling is now disabled/, RackResponseBody.new(body).to_s)
+    end
+
+    should "call __data__ if password is provided" do
+      profiled_app = Rack::PerftoolsProfiler.new(@app, :password => "secret")
+      actual_password = "secret"
+      start_env = Rack::MockRequest.env_for('/__start__', :params => "profile=#{actual_password}")
+      stop_env = Rack::MockRequest.env_for('/__stop__', :params => "profile=#{actual_password}")
+      data_env = Rack::MockRequest.env_for('/__data__', :params => "profile=#{actual_password}")
+      profiled_app.call(start_env)
+      profiled_app.call(@root_request_env)
+      profiled_app.call(stop_env)
+      status, _, body = profiled_app.call(data_env)
+      assert_equal 200, status
+      assert_match(/Total: \d+ samples/, RackResponseBody.new(body).to_s)
+    end
+
+    should "error on __start__ if password does not match" do
+      profiled_app = Rack::PerftoolsProfiler.new(@app, :password => "secret")
+      actual_password = "foobar"
+      start_env = Rack::MockRequest.env_for('/__start__', :params => "profile=#{actual_password}")
+      status, _, body = profiled_app.call(start_env)
+      assert_equal 401, status
+      assert_match(/Profiling is password-protected/, RackResponseBody.new(body).to_s)
+    end
+
+    should "error on __stop__ if password does not match" do
+      profiled_app = Rack::PerftoolsProfiler.new(@app, :password => "secret")
+      actual_password = "foobar"
+      stop_env = Rack::MockRequest.env_for('/__stop__', :params => "profile={actual_password}")
+      status, _, body = profiled_app.call(stop_env)
+      assert_equal 401, status
+      assert_match(/Profiling is password-protected/, RackResponseBody.new(body).to_s)
+    end
+
+    should "error on __data__ if password does not match" do
+      profiled_app = Rack::PerftoolsProfiler.new(@app, :password => "secret")
+      actual_password = "foobar"
+      data_env = Rack::MockRequest.env_for('/__data__', :params => "profile={actual_password}")
+      status, _, body = profiled_app.call(data_env)
+      assert_equal 401, status
+      assert_match(/Profiling is password-protected/, RackResponseBody.new(body).to_s)
+    end
+
+    should "error on __start__ if password is missing" do
+      profiled_app = Rack::PerftoolsProfiler.new(@app, :password => "secret")
+      actual_password = "foobar"
+      start_env = Rack::MockRequest.env_for('/__start__')
+      status, _, body = profiled_app.call(start_env)
+      assert_equal 401, status
+      assert_match(/Profiling is password-protected/, RackResponseBody.new(body).to_s)
+    end
+
+    should "error on __stop__ if password is missing" do
+      profiled_app = Rack::PerftoolsProfiler.new(@app, :password => "secret")
+      actual_password = "foobar"
+      stop_env = Rack::MockRequest.env_for('/__stop__')
+      status, _, body = profiled_app.call(stop_env)
+      assert_equal 401, status
+      assert_match(/Profiling is password-protected/, RackResponseBody.new(body).to_s)
+    end
+
+    should "error on __data__ if password is missing" do
+      profiled_app = Rack::PerftoolsProfiler.new(@app, :password => "secret")
+      actual_password = "foobar"
+      data_env = Rack::MockRequest.env_for('/__data__')
+      status, _, body = profiled_app.call(data_env)
+      assert_equal 401, status
+      assert_match(/Profiling is password-protected/, RackResponseBody.new(body).to_s)
+    end
+
+  end
+
 end

data/test/single_request_profiling_test.rb

@@ -6,7 +6,7 @@ class SingleRequestProfilingTest < Test::Unit::TestCase
   def setup
     @app = lambda { |env| ITERATIONS.times {1+2+3+4+5}; [200, {'Content-Type' => 'text/plain'}, ['Oh hai der']] }
     @slow_app = lambda { |env| ITERATIONS.times {1+2+3+4+5}; [200, {'Content-Type' => 'text/plain'}, ['slow app']] }
-    @root_request_env = Rack::MockRequest.env_for("/")    
+    @root_request_env = Rack::MockRequest.env_for("/")
     @profiled_request_env = Rack::MockRequest.env_for("/", :params => "profile=true")
     @profiled_request_env_with_times = Rack::MockRequest.env_for("/", :params => "profile=true&times=2")
   end
@@ -75,7 +75,8 @@ class SingleRequestProfilingTest < Test::Unit::TestCase
 
     should "allow 'printer' param override :default_printer option'" do
       env = Rack::MockRequest.env_for('/', :params => 'profile=true&printer=gif')
-      _, headers, _ = Rack::PerftoolsProfiler.new(@app, :default_printer => 'pdf').call(env)
+      status, headers, body = Rack::PerftoolsProfiler.new(@app, :default_printer => 'pdf').call(env)
+      assert_ok status, body
       assert_equal 'image/gif', headers['Content-Type']
     end
 
@@ -101,7 +102,7 @@ class SingleRequestProfilingTest < Test::Unit::TestCase
     end
 
     context "when in bundler mode" do
-      
+
       should "call pprof.rb using 'bundle' command if bundler is set" do
         status = stub_everything(:exitstatus => 0)
         profiled_app = Rack::PerftoolsProfiler.new(@app, :bundler => true)
@@ -120,7 +121,7 @@ class SingleRequestProfilingTest < Test::Unit::TestCase
         Dir.expects(:chdir).with('.').returns(["","",0])
         profiled_app.call(@profiled_request_env)
       end
-      
+
     end
 
     context "when the nodecount parameter is specified" do
@@ -178,7 +179,7 @@ class SingleRequestProfilingTest < Test::Unit::TestCase
           objects = ENV['CPUPROFILE_OBJECTS']
           [200, {}, ["hi"]]
         end
-        
+
         request = Rack::MockRequest.env_for("/", :params => 'profile=true&mode=objects')
         rack_profiler = Rack::PerftoolsProfiler.new(app, :mode => :cputime)
         rack_profiler.call(request)
@@ -192,7 +193,7 @@ class SingleRequestProfilingTest < Test::Unit::TestCase
         request = Rack::MockRequest.env_for("/", :params => "profile=true&mode=#{mode}")
         status, _, body = profiled_app.call(request)
         assert_equal 400, status
-        assert_match(/Cannot change mode to '#{mode}'.\nPer-request mode changes are only available for the following modes: 'methods', 'objects'/, 
+        assert_match(/Cannot change mode to '#{mode}'.\nPer-request mode changes are only available for the following modes: 'methods', 'objects'/,
                      RackResponseBody.new(body).to_s)
       end
 
@@ -202,8 +203,8 @@ class SingleRequestProfilingTest < Test::Unit::TestCase
         request = Rack::MockRequest.env_for("/", :params => "profile=true&mode=#{mode}")
         status, _, body = profiled_app.call(request)
         assert_equal 400, status
-        assert_match(/Cannot change mode to '#{mode}'.\nPer-request mode changes are only available for the following modes: 'methods', 'objects'/, 
-                     RackResponseBody.new(body).to_s)        
+        assert_match(/Cannot change mode to '#{mode}'.\nPer-request mode changes are only available for the following modes: 'methods', 'objects'/,
+                     RackResponseBody.new(body).to_s)
       end
 
       should "return error message if mode is 'cputime'" do
@@ -212,8 +213,8 @@ class SingleRequestProfilingTest < Test::Unit::TestCase
         request = Rack::MockRequest.env_for("/", :params => "profile=true&mode=#{mode}")
         status, _, body = profiled_app.call(request)
         assert_equal 400, status
-        assert_match(/Cannot change mode to '#{mode}'.\nPer-request mode changes are only available for the following modes: 'methods', 'objects'/, 
-                     RackResponseBody.new(body).to_s)        
+        assert_match(/Cannot change mode to '#{mode}'.\nPer-request mode changes are only available for the following modes: 'methods', 'objects'/,
+                     RackResponseBody.new(body).to_s)
       end
 
     end
@@ -231,7 +232,7 @@ class SingleRequestProfilingTest < Test::Unit::TestCase
       _, headers, _ = Rack::PerftoolsProfiler.new(@app, :default_printer => 'text').call(@profiled_request_env)
       assert_equal "text/plain", headers['Content-Type']
     end
-    
+
     should 'have Content-Length' do
       _, headers, _ = Rack::PerftoolsProfiler.new(@slow_app, :default_printer => 'text').call(@profiled_request_env)
       assert (headers.fetch('Content-Length').to_i > 500)
@@ -242,26 +243,30 @@ class SingleRequestProfilingTest < Test::Unit::TestCase
   context 'when using the gif printer' do
 
     should 'gif printer has Content-Type image/gif' do
-      _, headers, _ = Rack::PerftoolsProfiler.new(@app, :default_printer => 'gif').call(@profiled_request_env)
+      status, headers, body = Rack::PerftoolsProfiler.new(@app, :default_printer => 'gif').call(@profiled_request_env)
+      assert_ok status, body
       assert_equal "image/gif", headers['Content-Type']
     end
 
     should 'gif printer has Content-Length' do
-      _, headers, _ = Rack::PerftoolsProfiler.new(@slow_app, :default_printer => 'gif').call(@profiled_request_env)
+      status, headers, body = Rack::PerftoolsProfiler.new(@slow_app, :default_printer => 'gif').call(@profiled_request_env)
+      assert_ok status, body
       assert headers.fetch('Content-Length').to_i > 25_000
     end
 
     should 'pdf printer has Content-Type application/pdf' do
-      _, headers, _ = Rack::PerftoolsProfiler.new(@app, :default_printer => 'pdf').call(@profiled_request_env)
+      status, headers, body = Rack::PerftoolsProfiler.new(@app, :default_printer => 'pdf').call(@profiled_request_env)
+      assert_ok status, body
       assert_equal "application/pdf", headers['Content-Type']
     end
 
   end
-  
+
   context 'when using the raw printer' do
 
     should 'have default filename' do
-      _, headers, _ = Rack::PerftoolsProfiler.new(@app, :default_printer => 'raw').call(@profiled_request_env)
+      status, headers, body = Rack::PerftoolsProfiler.new(@app, :default_printer => 'raw').call(@profiled_request_env)
+      assert_ok status, body
       assert_equal %q{attachment; filename="profile_data.raw"}, headers['Content-Disposition']
     end
 
@@ -282,8 +287,8 @@ class SingleRequestProfilingTest < Test::Unit::TestCase
     app = @app.clone
     app.expects(:call).with(expected_env)
     Rack::PerftoolsProfiler.new(app, :default_printer => 'gif').call(env)
-    # I used to clone the environment to avoid conflicts, but this seems to break 
-    # Devise/Warden. 
+    # I used to clone the environment to avoid conflicts, but this seems to break
+    # Devise/Warden.
     # assert_equal env, old_env
   end
 
@@ -291,8 +296,8 @@ class SingleRequestProfilingTest < Test::Unit::TestCase
 
     should "not return profiling data" do
       app = @app.clone
-      env = Rack::MockRequest.env_for('/', 
-                                      :method => 'post', 
+      env = Rack::MockRequest.env_for('/',
+                                      :method => 'post',
                                       :params => {'profile' => 'true'})
       status, headers, body = Rack::PerftoolsProfiler.new(app, :default_printer => 'gif').call(env)
       assert_equal 200, status
@@ -301,12 +306,12 @@ class SingleRequestProfilingTest < Test::Unit::TestCase
     end
 
     should "call underlying app unchanged POST data" do
-      env = Rack::MockRequest.env_for('/', 
+      env = Rack::MockRequest.env_for('/',
                                       :method => 'post',
                                       :params => 'profile=true&times=1&param=value&printer=gif&focus=foo&ignore=bar')
       app = lambda do |env|
         request = Rack::Request.new(env)
-        expected = 
+        expected =
           {
           'profile' => 'true',
           'times' => '1',
@@ -318,13 +323,25 @@ class SingleRequestProfilingTest < Test::Unit::TestCase
         assert_equal expected, request.POST
         [200, {}, ["hi"]]
       end
-      
+
       Rack::PerftoolsProfiler.new(app, :default_printer => 'gif').call(env)
     end
 
   end
 
   context "when a profile password is required" do
+    should "call the app directly when 'profile' is not a request parameter" do
+      env = Rack::MockRequest.env_for('/', :params => {})
+      app = lambda do |env|
+        request = Rack::Request.new(env)
+        assert_equal( {}, request.GET)
+        [200, {}, ["HI"]]
+      end
+      status, headers, body = Rack::PerftoolsProfiler.new(app, :default_printer => 'pdf', :password => "secret_password").call(env)
+      assert_equal 200, status
+      assert_equal ["HI"], body
+    end
+
     should "error if password does not match" do
       app = @app.clone
       env = Rack::MockRequest.env_for('/', :params => {'profile' => 'true'})
@@ -336,7 +353,8 @@ class SingleRequestProfilingTest < Test::Unit::TestCase
 
     should "profile if the parameter matches" do
       env = Rack::MockRequest.env_for('/', :params => 'profile=secret_password&printer=gif')
-      _, headers, _ = Rack::PerftoolsProfiler.new(@app, :default_printer => 'pdf', :password => 'secret_password').call(env)
+      status, headers, body = Rack::PerftoolsProfiler.new(@app, :default_printer => 'pdf', :password => 'secret_password').call(env)
+      assert_ok status, body
       assert_equal 'image/gif', headers['Content-Type']
     end
   end