X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/70d6880e10881dfd4b68f51cf16609a9f8aaff24..6ed749e7ebad5eeff04ccf1a8f33c078b9f46031:/test/controllers/diary_entries_controller_test.rb
diff --git a/test/controllers/diary_entries_controller_test.rb b/test/controllers/diary_entries_controller_test.rb
index 426bc3851..6d7ca304a 100644
--- a/test/controllers/diary_entries_controller_test.rb
+++ b/test/controllers/diary_entries_controller_test.rb
@@ -664,6 +664,18 @@ class DiaryEntriesControllerTest < ActionController::TestCase
assert_match "
<script>", response.body
end
+ def test_feed_delay
+ create(:diary_entry, :created_at => 7.hours.ago)
+ create(:diary_entry, :created_at => 5.hours.ago)
+ get :rss, :params => { :format => :rss }
+ assert_select "rss>channel>item", :count => 2
+
+ with_diary_feed_delay(6) do
+ get :rss, :params => { :format => :rss }
+ assert_select "rss>channel>item", :count => 1
+ end
+ end
+
def test_show
user = create(:user)
suspended_user = create(:user, :suspended)
@@ -726,7 +738,7 @@ class DiaryEntriesControllerTest < ActionController::TestCase
:params => { :display_name => user.display_name, :id => diary_entry.id },
:session => { :user => user }
assert_response :redirect
- assert_redirected_to :action => :show, :display_name => user.display_name, :id => diary_entry.id
+ assert_redirected_to :controller => :errors, :action => :forbidden
assert_equal true, DiaryEntry.find(diary_entry.id).visible
# Finally try as an administrator
@@ -754,7 +766,7 @@ class DiaryEntriesControllerTest < ActionController::TestCase
:params => { :display_name => user.display_name, :id => diary_entry.id, :comment => diary_comment.id },
:session => { :user => user }
assert_response :redirect
- assert_redirected_to :action => :show, :display_name => user.display_name, :id => diary_entry.id
+ assert_redirected_to :controller => :errors, :action => :forbidden
assert_equal true, DiaryComment.find(diary_comment.id).visible
# Finally try as an administrator
@@ -897,4 +909,13 @@ class DiaryEntriesControllerTest < ActionController::TestCase
assert_select "a[href=?]", "/user/#{ERB::Util.u(entry.user.display_name)}/diary/#{entry.id}"
end
end
+
+ def with_diary_feed_delay(value)
+ diary_feed_delay = Settings.diary_feed_delay
+ Settings.diary_feed_delay = value
+
+ yield
+
+ Settings.diary_feed_delay = diary_feed_delay
+ end
end