X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7fc00c9314b6d774616ec9bb298f7a4dd2c63b8d..399ade116adb8250bbf92efa8dfeb3ca1090c7e4:/test/controllers/diary_entries_controller_test.rb?ds=sidebyside
diff --git a/test/controllers/diary_entries_controller_test.rb b/test/controllers/diary_entries_controller_test.rb
index 88a67ef12..2b4230db7 100644
--- a/test/controllers/diary_entries_controller_test.rb
+++ b/test/controllers/diary_entries_controller_test.rb
@@ -85,10 +85,18 @@ class DiaryEntriesControllerTest < ActionController::TestCase
{ :path => "/user/username/diary/1/hide", :method => :post },
{ :controller => "diary_entries", :action => "hide", :display_name => "username", :id => "1" }
)
+ assert_routing(
+ { :path => "/user/username/diary/1/unhide", :method => :post },
+ { :controller => "diary_entries", :action => "unhide", :display_name => "username", :id => "1" }
+ )
assert_routing(
{ :path => "/user/username/diary/1/hidecomment/2", :method => :post },
{ :controller => "diary_entries", :action => "hidecomment", :display_name => "username", :id => "1", :comment => "2" }
)
+ assert_routing(
+ { :path => "/user/username/diary/1/unhidecomment/2", :method => :post },
+ { :controller => "diary_entries", :action => "unhidecomment", :display_name => "username", :id => "1", :comment => "2" }
+ )
assert_routing(
{ :path => "/user/username/diary/1/subscribe", :method => :post },
{ :controller => "diary_entries", :action => "subscribe", :display_name => "username", :id => "1" }
@@ -664,6 +672,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)
@@ -738,6 +758,33 @@ class DiaryEntriesControllerTest < ActionController::TestCase
assert_equal false, DiaryEntry.find(diary_entry.id).visible
end
+ def test_unhide
+ user = create(:user)
+
+ # Try without logging in
+ diary_entry = create(:diary_entry, :user => user, :visible => false)
+ post :unhide,
+ :params => { :display_name => user.display_name, :id => diary_entry.id }
+ assert_response :forbidden
+ assert_equal false, DiaryEntry.find(diary_entry.id).visible
+
+ # Now try as a normal user
+ post :unhide,
+ :params => { :display_name => user.display_name, :id => diary_entry.id },
+ :session => { :user => user }
+ assert_response :redirect
+ assert_redirected_to :controller => :errors, :action => :forbidden
+ assert_equal false, DiaryEntry.find(diary_entry.id).visible
+
+ # Finally try as an administrator
+ post :unhide,
+ :params => { :display_name => user.display_name, :id => diary_entry.id },
+ :session => { :user => create(:administrator_user) }
+ assert_response :redirect
+ assert_redirected_to :action => :index, :display_name => user.display_name
+ assert_equal true, DiaryEntry.find(diary_entry.id).visible
+ end
+
def test_hidecomment
user = create(:user)
administrator_user = create(:administrator_user)
@@ -766,6 +813,34 @@ class DiaryEntriesControllerTest < ActionController::TestCase
assert_equal false, DiaryComment.find(diary_comment.id).visible
end
+ def test_unhidecomment
+ user = create(:user)
+ administrator_user = create(:administrator_user)
+ diary_entry = create(:diary_entry, :user => user)
+ diary_comment = create(:diary_comment, :diary_entry => diary_entry, :visible => false)
+ # Try without logging in
+ post :unhidecomment,
+ :params => { :display_name => user.display_name, :id => diary_entry.id, :comment => diary_comment.id }
+ assert_response :forbidden
+ assert_equal false, DiaryComment.find(diary_comment.id).visible
+
+ # Now try as a normal user
+ post :unhidecomment,
+ :params => { :display_name => user.display_name, :id => diary_entry.id, :comment => diary_comment.id },
+ :session => { :user => user }
+ assert_response :redirect
+ assert_redirected_to :controller => :errors, :action => :forbidden
+ assert_equal false, DiaryComment.find(diary_comment.id).visible
+
+ # Finally try as an administrator
+ post :unhidecomment,
+ :params => { :display_name => user.display_name, :id => diary_entry.id, :comment => diary_comment.id },
+ :session => { :user => administrator_user }
+ assert_response :redirect
+ assert_redirected_to :action => :show, :display_name => user.display_name, :id => diary_entry.id
+ assert_equal true, DiaryComment.find(diary_comment.id).visible
+ end
+
def test_comments
user = create(:user)
other_user = create(:user)
@@ -897,4 +972,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