rack-bug 0.2.1 → 0.3.0

data/spec/rack/bug/panels/log_panel_spec.rb

@@ -4,22 +4,23 @@ module Rack::Bug
   describe LogPanel do
     before do
       LogPanel.reset
-      header "rack-bug.panel_classes", [LogPanel]
+      rack_env "rack-bug.panel_classes", [LogPanel]
     end
-    
+
     describe "heading" do
       it "displays 'Log'" do
-        response = get "/"
+        response = get_via_rack "/"
         response.should have_heading("Log")
       end
     end
-    
+
     describe "content" do
       it "displays recorded log lines" do
-        LogPanel.record("This is a logged message")
-        response = get "/"
+        LogPanel.record("This is a logged message", 0)
+        response = get_via_rack "/"
         response.should contain("This is a logged message")
+        response.should contain("DEBUG")
       end
     end
   end
-end
+end

data/spec/rack/bug/panels/memory_panel_spec.rb

@@ -3,19 +3,19 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 module Rack::Bug
   describe MemoryPanel do
     before do
-      header "rack-bug.panel_classes", [MemoryPanel]
+      rack_env "rack-bug.panel_classes", [MemoryPanel]
     end
-    
+
     describe "heading" do
       it "displays the total memory" do
-        response = get "/"
+        response = get_via_rack "/"
         response.should have_heading(/\d+ KB total/)
       end
-      
+
       it "displays the memory change during the request" do
-        response = get "/"
+        response = get_via_rack "/"
         response.should have_heading(/\d+ KB Δ/)
       end
     end
   end
-end
+end

data/spec/rack/bug/panels/rails_info_panel_spec.rb

@@ -3,13 +3,13 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 module Rack::Bug
   describe RailsInfoPanel do
     before do
-      header "rack-bug.panel_classes", [RailsInfoPanel]
+      rack_env "rack-bug.panel_classes", [RailsInfoPanel]
     end
-    
+
     describe "heading" do
       it "displays the Rails version" do
         Rails.stub!(:version => "v2.3.0")
-        response = get "/"
+        response = get_via_rack "/"
         response.should have_heading("Rails v2.3.0")
       end
     end
@@ -17,9 +17,9 @@ module Rack::Bug
     describe "content" do
       it "displays the Rails::Info properties" do
         Rails::Info.stub!(:properties => [["Name", "Value"]])
-        response = get "/"
+        response = get_via_rack "/"
         response.should have_row("#rails_info", "Name", "Value")
       end
     end
   end
-end
+end

data/spec/rack/bug/panels/redis_panel_spec.rb

@@ -5,53 +5,65 @@ module Rack::Bug
   describe RedisPanel do
     before do
       RedisPanel.reset
-      header "rack-bug.panel_classes", [RedisPanel]
+      rack_env "rack-bug.panel_classes", [RedisPanel]
     end
-    
+
     describe "heading" do
       it "displays the total redis time" do
-        response = get "/"
+        response = get_via_rack "/"
         response.should have_heading("Redis: 0.00ms")
       end
     end
-    
+
     describe "content" do
       describe "usage table" do
         it "displays the total number of redis calls" do
-          RedisPanel.record(["get, user:1"]) { }
-          response = get "/"
-          
+          RedisPanel.record(["get, user:1"], Kernel.caller) { }
+          response = get_via_rack "/"
+
           # This causes a bus error:
           # response.should have_selector("th:content('Total Calls') + td", :content => "1")
 
           response.should have_row("#redis_usage", "Total Calls", "1")
         end
-        
+
         it "displays the total redis time" do
-          response = get "/"
+          response = get_via_rack "/"
           response.should have_row("#redis_usage", "Total Time", "0.00ms")
         end
       end
-      
+
       describe "breakdown" do
         it "displays each redis operation" do
-          RedisPanel.record(["get, user:1"]) { }
-          response = get "/"
+          RedisPanel.record(["get, user:1"], Kernel.caller) { }
+          response = get_via_rack "/"
           response.should have_row("#redis_breakdown", "get")
         end
-        
+
         it "displays the time for redis call" do
-          RedisPanel.record(["get, user:1"]) { }
-          response = get "/"
+          RedisPanel.record(["get, user:1"], Kernel.caller) { }
+          response = get_via_rack "/"
           response.should have_row("#redis_breakdown", "user:1", TIME_MS_REGEXP)
         end
-        
+
         it "displays the arguments for each redis call" do
-          RedisPanel.record(["get, user:1"]) { }
-          response = get "/"
+          RedisPanel.record(["get, user:1"], Kernel.caller) { }
+          response = get_via_rack "/"
           response.should have_row("#redis_breakdown", "user:1", "get")
         end
+
+        it "displays a link to show the backtrace when it's available" do
+          RedisPanel.record(["get, user:1"], Kernel.caller) { }
+          response = get_via_rack "/"
+          response.should have_row("#redis_breakdown", "user:1", "Show Backtrace")
+        end
+
+        it "does not display a link to show the backtrace when it's not available" do
+          RedisPanel.record(["get, user:1"], []) { }
+          response = get_via_rack "/"
+          response.should_not contain("Show Backtrace")
+        end
       end
     end
   end
-end
+end

data/spec/rack/bug/panels/sql_panel_spec.rb

@@ -4,133 +4,133 @@ module Rack::Bug
   describe SQLPanel do
     before do
       SQLPanel.reset
-      header "rack-bug.panel_classes", [SQLPanel]
+      rack_env "rack-bug.panel_classes", [SQLPanel]
     end
-    
+
     describe "heading" do
       it "displays the total SQL query count" do
         SQLPanel.record("SELECT NOW();") { }
-        response = get "/"
+        response = get_via_rack "/"
         response.should have_heading("1 Queries")
       end
-      
+
       it "displays the total SQL time" do
         SQLPanel.record("SELECT NOW();") { }
-        response = get "/"
+        response = get_via_rack "/"
         response.should have_heading(/Queries \(\d+\.\d{2}ms\)/)
       end
     end
-    
+
     describe "content" do
       it "displays each executed SQL query" do
         SQLPanel.record("SELECT NOW();") { }
-        response = get "/"
+        response = get_via_rack "/"
         response.should have_row("#sql", "SELECT NOW();")
       end
-      
+
       it "displays the time of each executed SQL query" do
         SQLPanel.record("SELECT NOW();") { }
-        response = get "/"
+        response = get_via_rack "/"
         response.should have_row("#sql", "SELECT NOW();", TIME_MS_REGEXP)
       end
     end
-    
+
     def stub_result(results = [[]])
       columns = results.first
       fields = columns.map { |c| stub("field", :name => c) }
       rows = results[1..-1]
-      
+
       result = stub("result", :fetch_fields => fields)
       result.stub!(:each).and_yield(*rows)
       return result
     end
-    
+
     def expect_query(sql, results)
       conn = stub("connection")
       ActiveRecord::Base.stub!(:connection => conn)
       conn.should_receive(:execute).with(sql).and_return(stub_result(results))
     end
-    
+
     describe "execute_sql" do
       it "displays the query results" do
-        header "rack-bug.secret_key", "abc"
+        rack_env "rack-bug.secret_key", "abc"
         expect_query "SELECT username FROM users",
           [["username"],
            ["bryan"]]
-        
-        response = get "/__rack_bug__/execute_sql", :query => "SELECT username FROM users",
+
+        response = get_via_rack "/__rack_bug__/execute_sql", :query => "SELECT username FROM users",
           :hash => "6f286f55b75716e5c91f16d77d09fa73b353ebc1"
         response.should contain("SELECT username FROM users")
         response.should be_ok
       end
-      
+
       it "is forbidden when the hash is missing or wrong" do
-        header "rack-bug.secret_key", 'abc'
-        
+        rack_env "rack-bug.secret_key", 'abc'
+
         lambda {
-          get "/__rack_bug__/execute_sql", :query => "SELECT username FROM users",
+          get_via_rack "/__rack_bug__/execute_sql", :query => "SELECT username FROM users",
             :hash => "foobar"
         }.should raise_error(SecurityError)
       end
-      
+
       it "is not available when the rack-bug.secret_key is nil" do
-        header "rack-bug.secret_key", nil
-        
+        rack_env "rack-bug.secret_key", nil
+
         lambda {
-          get "/__rack_bug__/execute_sql", :query => "SELECT username FROM users",
+          get_via_rack "/__rack_bug__/execute_sql", :query => "SELECT username FROM users",
             :hash => "6f286f55b75716e5c91f16d77d09fa73b353ebc1"
         }.should raise_error(SecurityError)
       end
-      
+
       it "is not available when the rack-bug.secret_key is an empty string" do
-        header "rack-bug.secret_key", ""
-        
+        rack_env "rack-bug.secret_key", ""
+
         lambda {
-          get "/__rack_bug__/execute_sql", :query => "SELECT username FROM users",
+          get_via_rack "/__rack_bug__/execute_sql", :query => "SELECT username FROM users",
             :hash => "6f286f55b75716e5c91f16d77d09fa73b353ebc1"
         }.should raise_error(SecurityError)
       end
     end
-    
+
     describe "explain_sql" do
       it "displays the query explain plan" do
-        header "rack-bug.secret_key", "abc"
+        rack_env "rack-bug.secret_key", "abc"
         expect_query "EXPLAIN SELECT username FROM users",
           [["table"],
            ["users"]]
-        
-        response = get "/__rack_bug__/explain_sql", :query => "SELECT username FROM users",
+
+        response = get_via_rack "/__rack_bug__/explain_sql", :query => "SELECT username FROM users",
           :hash => "6f286f55b75716e5c91f16d77d09fa73b353ebc1"
         response.should contain("SELECT username FROM users")
         response.should be_ok
       end
-      
+
       it "is forbidden when the hash is missing or wrong" do
-        header "rack-bug.secret_key", 'abc'
-        
+        rack_env "rack-bug.secret_key", 'abc'
+
         lambda {
-          get "/__rack_bug__/explain_sql", :query => "SELECT username FROM users",
+          get_via_rack "/__rack_bug__/explain_sql", :query => "SELECT username FROM users",
             :hash => "foobar"
         }.should raise_error(SecurityError)
       end
-      
+
       it "is not available when the rack-bug.secret_key is nil" do
-        header "rack-bug.secret_key", nil
-        
+        rack_env "rack-bug.secret_key", nil
+
         lambda {
-          get "/__rack_bug__/explain_sql", :query => "SELECT username FROM users",
+          get_via_rack "/__rack_bug__/explain_sql", :query => "SELECT username FROM users",
             :hash => "6f286f55b75716e5c91f16d77d09fa73b353ebc1"
         }.should raise_error(SecurityError)
       end
-      
+
       it "is not available when the rack-bug.secret_key is an empty string" do
-        header "rack-bug.secret_key", ""
-        
+        rack_env "rack-bug.secret_key", ""
+
         lambda {
-          get "/__rack_bug__/explain_sql", :query => "SELECT username FROM users",
+          get_via_rack "/__rack_bug__/explain_sql", :query => "SELECT username FROM users",
             :hash => "6f286f55b75716e5c91f16d77d09fa73b353ebc1"
         }.should raise_error(SecurityError)
       end
     end
   end
-end
+end

data/spec/rack/bug/panels/templates_panel_spec.rb

@@ -4,63 +4,63 @@ module Rack::Bug
   describe TemplatesPanel do
     before do
       TemplatesPanel.reset
-      header "rack-bug.panel_classes", [TemplatesPanel]
+      rack_env "rack-bug.panel_classes", [TemplatesPanel]
     end
-    
+
     describe "heading" do
       it "displays the total rendering time" do
-        response = get "/"
+        response = get_via_rack "/"
         response.should have_heading("Templates: 0.00ms")
       end
     end
-    
+
     describe "content" do
       it "displays the template paths" do
         TemplatesPanel.record("users/show") { }
-        response = get "/"
+        response = get_via_rack "/"
         response.should contain("users/show")
       end
-      
+
       it "displays the template children" do
         TemplatesPanel.record("users/show") do
           TemplatesPanel.record("users/toolbar") { }
         end
-        
-        response = get "/"
+
+        response = get_via_rack "/"
         response.should have_selector("li", :content => "users/show") do |li|
           li.should contain("users/toolbar")
         end
       end
-      
+
       context "for templates that rendered templates" do
         it "displays the total time" do
           TemplatesPanel.record("users/show") do
             TemplatesPanel.record("users/toolbar") { }
           end
-          
-          response = get "/"
+
+          response = get_via_rack "/"
           response.should have_selector("li", :content => "users/show") do |li|
             li.should contain(TIME_MS_REGEXP)
           end
         end
-        
+
         it "displays the exclusive time" do
           TemplatesPanel.record("users/show") do
             TemplatesPanel.record("users/toolbar") { }
           end
-          
-          response = get "/"
+
+          response = get_via_rack "/"
           response.should have_selector("li", :content => "users/show") do |li|
             li.should contain(/\d\.\d{2} exclusive/)
           end
         end
       end
-      
+
       context "for leaf templates" do
         it "does not display the exclusive time" do
           TemplatesPanel.record("users/show") { }
-          
-          response = get "/"
+
+          response = get_via_rack "/"
           response.should contain("users/show") do |li|
             li.should_not contain("exclusive")
           end
@@ -68,4 +68,4 @@ module Rack::Bug
       end
     end
   end
-end
+end

data/spec/rack/bug/panels/timer_panel_spec.rb

@@ -3,36 +3,36 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 module Rack::Bug
   describe TimerPanel do
     before do
-      header "rack-bug.panel_classes", [TimerPanel]
+      rack_env "rack-bug.panel_classes", [TimerPanel]
     end
-    
+
     describe "heading" do
       it "displays the elapsed time" do
-        response = get "/"
+        response = get_via_rack "/"
         response.should have_heading(TIME_MS_REGEXP)
       end
     end
-    
+
     describe "content" do
       it "displays the user CPU time" do
-        response = get "/"
+        response = get_via_rack "/"
         response.should have_row("#timer", "User CPU time", TIME_MS_REGEXP)
       end
-      
+
       it "displays the system CPU time" do
-        response = get "/"
+        response = get_via_rack "/"
         response.should have_row("#timer", "System CPU time", TIME_MS_REGEXP)
       end
-      
+
       it "displays the total CPU time" do
-        response = get "/"
+        response = get_via_rack "/"
         response.should have_row("#timer", "Total CPU time", TIME_MS_REGEXP)
       end
-      
+
       it "displays the elapsed time" do
-        response = get "/"
+        response = get_via_rack "/"
         response.should have_row("#timer", "Elapsed time", TIME_MS_REGEXP)
       end
     end
   end
-end
+end