@@ -230,44 +230,6 @@ class CachingTest < ActionController::IntegrationTest end - context "when privacy options and archive by type are enabled, and the basket has one public and one private item, it" do - - setup do - [@@site_basket, @@cache_basket].each do |basket| - basket.update_attributes({ :show_privacy_controls => true, :index_page_archives_as => 'by type' }) - @topic1 = new_topic({ :title => 'Public Item' }, basket) - @topic2 = new_topic({ :title => 'Private Item', :private_true => true }, basket) - end - end - - teardown do - [@@site_basket, @@cache_basket].each do |basket| - basket.update_attributes({ :show_privacy_controls => false, :index_page_archives_as => '' }) - end - end - - should "show the private links to users with permission" do - [@@site_basket, @@cache_basket].each do |basket| - visit "/#{basket.urlified_name}" - body_should_contain Regexp.new("\\( <a (.+)>(\\d+)</a> \\| private: <a (.+)>(\\d+)</a> \\)"), - :message => "Both public and private links should be visible on the #{basket.name} basket, but arn't." - end - end - - should "not show the private links if the user doesn't have permission" do - [@@site_basket, @@cache_basket].each do |basket| - visit "/#{basket.urlified_name}" # as admin to populate private cache - logout - visit "/#{basket.urlified_name}" - body_should_not_contain Regexp.new("\\( <a (.+)>(\\d+)</a> \\| private: <a (.+)>(\\d+)</a> \\)"), - :message => "Public and private links together should not be visible on the #{basket.name} basket, but they are." - body_should_contain Regexp.new("\\( <a (.+)>(\\d+)</a> \\)"), - :message => "The public link should be visible on the #{basket.name} basket, but isn't." - end - end - - end - end context "The topic show cache" do test/integration/caching_test.rb 5df85d875932723ada99bb61eba12f21ab17eeb1 Kieran Pilkington kieran@katipo.co.nz http://github.com/kete/kete/commit/775053345c43058c9fa80b537e0ec3fd130b9fda 775053345c43058c9fa80b537e0ec3fd130b9fda 2009-01-22T15:48:31-08:00 2009-01-22T15:48:31-08:00 refinement: the archive by type box is no longer cached which allows for accurate item counts. a570961e58d3a3df612a4eb7677cd7de0f1615b7 Kieran Pilkington kieran@katipo.co.nz