fix project page caching

i2w · Apr 1, 2010 · 17faaea · 17faaea
1 parent 4749b2d
commit 17faaea
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/lib/integrity/app.rb b/lib/integrity/app.rb
@@ -85,7 +85,7 @@ def last_modified(time)
 
     get "/:project" do
       login_required unless current_project.public?
-      last_modified current_project.builds.max(:updated_at)
+      last_modified current_project.builds.max(:created_at, :updated_at)
       show :project, :title => ["projects", current_project.name]
     end
 

diff --git a/test/acceptance/browse_builds_test.rb b/test/acceptance/browse_builds_test.rb
@@ -42,7 +42,7 @@ class BrowseBuildsTest < Test::Unit::AcceptanceTestCase
       :message => "No more pending tests :)",
       :committed_at => Time.mktime(2008, 12, 15, 18)
     )
-    Project.gen(:integrity, :builds => [build])
+    p = Project.gen(:integrity, :builds => [build])
 
     visit "/integrity"
 
@@ -53,9 +53,15 @@ class BrowseBuildsTest < Test::Unit::AcceptanceTestCase
     assert_have_tag("pre.output",   :content => "This is the build output")
 
     header "HTTP_IF_MODIFIED_SINCE", last_response["Last-Modified"]
-    visit "/"
-
+    visit "/integrity"
     assert_equal 304, last_response.status
+
+    p.builds << Build.gen(:pending)
+    p.save
+
+    header "HTTP_IF_MODIFIED_SINCE", last_response["Last-Modified"]
+    visit "/integrity"
+    assert_equal 200, last_response.status
   end
 
   scenario "Browsing to an individual build page" do
@@ -80,9 +86,9 @@ class BrowseBuildsTest < Test::Unit::AcceptanceTestCase
     assert_have_tag("button", :content => "Rebuild")
 
     visit "/integrity"
+
     header "HTTP_IF_MODIFIED_SINCE", last_response["Last-Modified"]
     visit "/integrity"
-
     assert_equal 304, last_response.status
   end
 end