X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a9c4b037a2f8300d083ae7286a8cd361e9fa7711..fa7841acbf0c0702d0f0988cd999f6a259aaf587:/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 0f071914e..7d543250b 100644
--- a/test/controllers/diary_entries_controller_test.rb
+++ b/test/controllers/diary_entries_controller_test.rb
@@ -1,6 +1,6 @@
require "test_helper"
-class DiaryEntriesControllerTest < ActionController::TestCase
+class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest
include ActionView::Helpers::NumberHelper
def setup
@@ -49,15 +49,6 @@ class DiaryEntriesControllerTest < ActionController::TestCase
{ :controller => "diary_entries", :action => "rss", :display_name => "username", :format => :rss }
)
- assert_routing(
- { :path => "/user/username/diary/comments", :method => :get },
- { :controller => "diary_entries", :action => "comments", :display_name => "username" }
- )
- assert_routing(
- { :path => "/user/username/diary/comments/1", :method => :get },
- { :controller => "diary_entries", :action => "comments", :display_name => "username", :page => "1" }
- )
-
assert_routing(
{ :path => "/diary/new", :method => :get },
{ :controller => "diary_entries", :action => "new" }
@@ -78,10 +69,6 @@ class DiaryEntriesControllerTest < ActionController::TestCase
{ :path => "/user/username/diary/1", :method => :put },
{ :controller => "diary_entries", :action => "update", :display_name => "username", :id => "1" }
)
- assert_routing(
- { :path => "/user/username/diary/1/newcomment", :method => :post },
- { :controller => "diary_entries", :action => "comment", :display_name => "username", :id => "1" }
- )
assert_routing(
{ :path => "/user/username/diary/1/hide", :method => :post },
{ :controller => "diary_entries", :action => "hide", :display_name => "username", :id => "1" }
@@ -91,17 +78,17 @@ class DiaryEntriesControllerTest < ActionController::TestCase
{ :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" }
+ { :path => "/user/username/diary/1/subscribe", :method => :get },
+ { :controller => "diary_entries", :action => "subscribe", :display_name => "username", :id => "1" }
)
assert_routing(
{ :path => "/user/username/diary/1/subscribe", :method => :post },
{ :controller => "diary_entries", :action => "subscribe", :display_name => "username", :id => "1" }
)
+ assert_routing(
+ { :path => "/user/username/diary/1/unsubscribe", :method => :get },
+ { :controller => "diary_entries", :action => "unsubscribe", :display_name => "username", :id => "1" }
+ )
assert_routing(
{ :path => "/user/username/diary/1/unsubscribe", :method => :post },
{ :controller => "diary_entries", :action => "unsubscribe", :display_name => "username", :id => "1" }
@@ -111,14 +98,14 @@ class DiaryEntriesControllerTest < ActionController::TestCase
def test_new_no_login
# Make sure that you are redirected to the login page when you
# are not logged in
- get :new
- assert_response :redirect
- assert_redirected_to :controller => :users, :action => :login, :referer => "/diary/new"
+ get new_diary_entry_path
+ assert_redirected_to login_path(:referer => "/diary/new")
end
def test_new_form
# Now try again when logged in
- get :new, :session => { :user => create(:user) }
+ session_for(create(:user))
+ get new_diary_entry_path
assert_response :success
assert_select "title", :text => /New Diary Entry/, :count => 1
assert_select "div.content-heading", :count => 1 do
@@ -132,21 +119,20 @@ class DiaryEntriesControllerTest < ActionController::TestCase
assert_select "input#latitude[name='diary_entry[latitude]']", :count => 1
assert_select "input#longitude[name='diary_entry[longitude]']", :count => 1
assert_select "input[name=commit][type=submit][value=Publish]", :count => 1
- assert_select "input[name=commit][type=submit][value=Edit]", :count => 1
- assert_select "input[name=commit][type=submit][value=Preview]", :count => 1
- assert_select "input", :count => 7
+ assert_select "button[type=button]", :text => "Edit", :count => 1
+ assert_select "button[type=button]", :text => "Preview", :count => 1
+ assert_select "input", :count => 4
end
end
end
def test_new_get_with_params
# Now try creating a diary entry using get
+ session_for(create(:user))
assert_difference "DiaryEntry.count", 0 do
- get :new,
- :params => { :commit => "save",
- :diary_entry => { :title => "New Title", :body => "This is a new body for the diary entry", :latitude => "1.1",
- :longitude => "2.2", :language_code => "en" } },
- :session => { :user => create(:user).id }
+ get new_diary_entry_path(:commit => "save",
+ :diary_entry => { :title => "New Title", :body => "This is a new body for the diary entry", :latitude => "1.1",
+ :longitude => "2.2", :language_code => "en" })
end
assert_response :success
assert_template :new
@@ -155,32 +141,29 @@ class DiaryEntriesControllerTest < ActionController::TestCase
def test_create_no_body
# Now try creating a invalid diary entry with an empty body
user = create(:user)
+ session_for(user)
assert_no_difference "DiaryEntry.count" do
- post :create,
- :params => { :commit => "save",
- :diary_entry => { :title => "New Title", :body => "", :latitude => "1.1",
- :longitude => "2.2", :language_code => "en" } },
- :session => { :user => user.id }
+ post diary_entries_path(:commit => "save",
+ :diary_entry => { :title => "New Title", :body => "", :latitude => "1.1",
+ :longitude => "2.2", :language_code => "en" })
end
assert_response :success
assert_template :new
- assert_nil UserPreference.where(:user_id => user.id, :k => "diary.default_language").first
+ assert_nil UserPreference.find_by(:user => user, :k => "diary.default_language")
end
def test_create
# Now try creating a diary entry
user = create(:user)
+ session_for(user)
assert_difference "DiaryEntry.count", 1 do
- post :create,
- :params => { :commit => "save",
- :diary_entry => { :title => "New Title", :body => "This is a new body for the diary entry", :latitude => "1.1",
- :longitude => "2.2", :language_code => "en" } },
- :session => { :user => user.id }
+ post diary_entries_path(:commit => "save",
+ :diary_entry => { :title => "New Title", :body => "This is a new body for the diary entry", :latitude => "1.1",
+ :longitude => "2.2", :language_code => "en" })
end
- assert_response :redirect
assert_redirected_to :action => :index, :display_name => user.display_name
- entry = DiaryEntry.order(:id).last
+ entry = DiaryEntry.last
assert_equal user.id, entry.user_id
assert_equal "New Title", entry.title
assert_equal "This is a new body for the diary entry", entry.body
@@ -191,24 +174,22 @@ class DiaryEntriesControllerTest < ActionController::TestCase
# checks if user was subscribed
assert_equal 1, entry.subscribers.length
- assert_equal "en", UserPreference.where(:user_id => user.id, :k => "diary.default_language").first.v
+ assert_equal "en", UserPreference.find_by(:user => user, :k => "diary.default_language").v
end
def test_create_german
create(:language, :code => "de")
user = create(:user)
+ session_for(user)
# Now try creating a diary entry in a different language
assert_difference "DiaryEntry.count", 1 do
- post :create,
- :params => { :commit => "save",
- :diary_entry => { :title => "New Title", :body => "This is a new body for the diary entry", :latitude => "1.1",
- :longitude => "2.2", :language_code => "de" } },
- :session => { :user => user.id }
+ post diary_entries_path(:commit => "save",
+ :diary_entry => { :title => "New Title", :body => "This is a new body for the diary entry", :latitude => "1.1",
+ :longitude => "2.2", :language_code => "de" })
end
- assert_response :redirect
assert_redirected_to :action => :index, :display_name => user.display_name
- entry = DiaryEntry.order(:id).last
+ entry = DiaryEntry.last
assert_equal user.id, entry.user_id
assert_equal "New Title", entry.title
assert_equal "This is a new body for the diary entry", entry.body
@@ -219,25 +200,24 @@ class DiaryEntriesControllerTest < ActionController::TestCase
# checks if user was subscribed
assert_equal 1, entry.subscribers.length
- assert_equal "de", UserPreference.where(:user_id => user.id, :k => "diary.default_language").first.v
+ assert_equal "de", UserPreference.find_by(:user => user, :k => "diary.default_language").v
end
def test_new_spammy
user = create(:user)
+ session_for(user)
+
# Generate some spammy content
spammy_title = "Spam Spam Spam Spam Spam"
spammy_body = 1.upto(50).map { |n| "http://example.com/spam#{n}" }.join(" ")
# Try creating a spammy diary entry
assert_difference "DiaryEntry.count", 1 do
- post :create,
- :params => { :commit => "save",
- :diary_entry => { :title => spammy_title, :body => spammy_body, :language_code => "en" } },
- :session => { :user => user.id }
+ post diary_entries_path(:commit => "save",
+ :diary_entry => { :title => spammy_title, :body => spammy_body, :language_code => "en" })
end
- assert_response :redirect
assert_redirected_to :action => :index, :display_name => user.display_name
- entry = DiaryEntry.order(:id).last
+ entry = DiaryEntry.last
assert_equal user.id, entry.user_id
assert_equal spammy_title, entry.title
assert_equal spammy_body, entry.body
@@ -245,10 +225,7 @@ class DiaryEntriesControllerTest < ActionController::TestCase
assert_equal "suspended", User.find(user.id).status
# Follow the redirect
- get :index,
- :params => { :display_name => user.display_name },
- :session => { :user => user }
- assert_response :redirect
+ get diary_entries_path(:display_name => user.display_name)
assert_redirected_to :controller => :users, :action => :suspended
end
@@ -260,33 +237,28 @@ class DiaryEntriesControllerTest < ActionController::TestCase
# Make sure that you are redirected to the login page when you are
# not logged in, without and with the id of the entry you want to edit
- get :edit,
- :params => { :display_name => entry.user.display_name, :id => entry.id }
- assert_response :redirect
- assert_redirected_to :controller => :users, :action => :login, :referer => "/user/#{ERB::Util.u(entry.user.display_name)}/diary/#{entry.id}/edit"
+ get edit_diary_entry_path(entry.user, entry)
+ assert_redirected_to login_path(:referer => "/user/#{ERB::Util.u(entry.user.display_name)}/diary/#{entry.id}/edit")
- # Verify that you get a not found error, when you pass a bogus id
- get :edit,
- :params => { :display_name => entry.user.display_name, :id => 9999 },
- :session => { :user => entry.user }
- assert_response :not_found
- assert_select "div.content-heading", :count => 1 do
- assert_select "h2", :text => "No entry with the id: 9999", :count => 1
- end
+ session_for(other_user)
# Verify that you get redirected to show if you are not the user
# that created the entry
- get :edit,
- :params => { :display_name => entry.user.display_name, :id => entry.id },
- :session => { :user => other_user }
- assert_response :redirect
+ get edit_diary_entry_path(entry.user, entry)
assert_redirected_to :action => :show, :display_name => entry.user.display_name, :id => entry.id
+ session_for(entry.user)
+
+ # Verify that you get a not found error, when you pass a bogus id
+ get edit_diary_entry_path(entry.user, :id => 9999)
+ assert_response :not_found
+ assert_select "div.content-heading", :count => 1 do
+ assert_select "h1", :text => "No entry with the id: 9999", :count => 1
+ end
+
# Now pass the id, and check that you can edit it, when using the same
# user as the person who created the entry
- get :edit,
- :params => { :display_name => entry.user.display_name, :id => entry.id },
- :session => { :user => entry.user }
+ get edit_diary_entry_path(entry.user, entry)
assert_response :success
assert_select "title", :text => /Edit Diary Entry/, :count => 1
assert_select "div.content-heading", :count => 1 do
@@ -300,9 +272,9 @@ class DiaryEntriesControllerTest < ActionController::TestCase
assert_select "input#latitude[name='diary_entry[latitude]']", :count => 1
assert_select "input#longitude[name='diary_entry[longitude]']", :count => 1
assert_select "input[name=commit][type=submit][value=Update]", :count => 1
- assert_select "input[name=commit][type=submit][value=Edit]", :count => 1
- assert_select "input[name=commit][type=submit][value=Preview]", :count => 1
- assert_select "input", :count => 8
+ assert_select "button[type=button]", :text => "Edit", :count => 1
+ assert_select "button[type=button]", :text => "Preview", :count => 1
+ assert_select "input", :count => 5
end
end
@@ -312,47 +284,40 @@ class DiaryEntriesControllerTest < ActionController::TestCase
new_latitude = "1.1"
new_longitude = "2.2"
new_language_code = "en"
- put :update,
- :params => { :display_name => entry.user.display_name, :id => entry.id, :commit => "save",
- :diary_entry => { :title => new_title, :body => new_body, :latitude => new_latitude,
- :longitude => new_longitude, :language_code => new_language_code } },
- :session => { :user => entry.user.id }
- assert_response :redirect
+ put diary_entry_path(entry.user, entry, :commit => "save",
+ :diary_entry => { :title => new_title, :body => new_body, :latitude => new_latitude,
+ :longitude => new_longitude, :language_code => new_language_code })
assert_redirected_to :action => :show, :display_name => entry.user.display_name, :id => entry.id
# Now check that the new data is rendered, when logged in
- get :show,
- :params => { :display_name => entry.user.display_name, :id => entry.id },
- :session => { :user => entry.user }
+ get diary_entry_path(entry.user, entry)
assert_response :success
assert_template "show"
- assert_select "title", :text => /Users' diaries | /, :count => 1
+ assert_select "title", :text => /Users' Diaries | /, :count => 1
assert_select "div.content-heading", :count => 1 do
- assert_select "h2", :text => /#{entry.user.display_name}'s diary/, :count => 1
+ assert_select "h1", :text => /#{entry.user.display_name}'s Diary/, :count => 1
end
assert_select "div#content", :count => 1 do
- assert_select "div.post_heading", :text => /#{new_title}/, :count => 1
+ assert_select "h2", :text => /#{new_title}/, :count => 1
# This next line won't work if the text has been run through the htmlize function
# due to formatting that could be introduced
assert_select "p", :text => /#{new_body}/, :count => 1
assert_select "abbr[class='geo'][title='#{number_with_precision(new_latitude, :precision => 4)}; #{number_with_precision(new_longitude, :precision => 4)}']", :count => 1
# As we're not logged in, check that you cannot edit
- # print @response.body
assert_select "a[href='/user/#{ERB::Util.u(entry.user.display_name)}/diary/#{entry.id}/edit']", :text => "Edit this entry", :count => 1
end
# and when not logged in as the user who wrote the entry
- get :show,
- :params => { :display_name => entry.user.display_name, :id => entry.id },
- :session => { :user => create(:user) }
+ session_for(create(:user))
+ get diary_entry_path(entry.user, entry)
assert_response :success
assert_template "show"
- assert_select "title", :text => /Users' diaries | /, :count => 1
+ assert_select "title", :text => /Users' Diaries | /, :count => 1
assert_select "div.content-heading", :count => 1 do
- assert_select "h2", :text => /#{entry.user.display_name}'s diary/, :count => 1
+ assert_select "h1", :text => /#{entry.user.display_name}'s Diary/, :count => 1
end
assert_select "div#content", :count => 1 do
- assert_select "div.post_heading", :text => /#{new_title}/, :count => 1
+ assert_select "h2", :text => /#{new_title}/, :count => 1
# This next line won't work if the text has been run through the htmlize function
# due to formatting that could be introduced
assert_select "p", :text => /#{new_body}/, :count => 1
@@ -365,137 +330,33 @@ class DiaryEntriesControllerTest < ActionController::TestCase
def test_edit_i18n
user = create(:user)
diary_entry = create(:diary_entry, :language_code => "en", :user => user)
- get :edit,
- :params => { :display_name => user.display_name, :id => diary_entry.id },
- :session => { :user => user }
+ session_for(user)
+ get edit_diary_entry_path(user, diary_entry)
assert_response :success
assert_select "span[class=translation_missing]", false, "Missing translation in edit diary entry"
end
- def test_comment
+ def test_update
user = create(:user)
other_user = create(:user)
- entry = create(:diary_entry, :user => user)
+ diary_entry = create(:diary_entry, :language_code => "en", :user => user, :title => "Original Title")
- # Make sure that you are denied when you are not logged in
- post :comment,
- :params => { :display_name => entry.user.display_name, :id => entry.id }
+ put diary_entry_path(user, diary_entry, :diary_entry => { :title => "Updated Title" })
assert_response :forbidden
+ diary_entry.reload
+ assert_equal "Original Title", diary_entry.title
- # Verify that you get a not found error, when you pass a bogus id
- post :comment,
- :params => { :display_name => entry.user.display_name, :id => 9999 },
- :session => { :user => other_user }
- assert_response :not_found
- assert_select "div.content-heading", :count => 1 do
- assert_select "h2", :text => "No entry with the id: 9999", :count => 1
- end
-
- post :subscribe,
- :params => { :id => entry.id, :display_name => entry.user.display_name },
- :session => { :user => user }
-
- # Now try an invalid comment with an empty body
- assert_no_difference "ActionMailer::Base.deliveries.size" do
- assert_no_difference "DiaryComment.count" do
- assert_no_difference "entry.subscribers.count" do
- perform_enqueued_jobs do
- post :comment,
- :params => { :display_name => entry.user.display_name, :id => entry.id, :diary_comment => { :body => "" } },
- :session => { :user => other_user }
- end
- end
- end
- end
- assert_response :success
- assert_template :show
-
- # Now try again with the right id
- assert_difference "ActionMailer::Base.deliveries.size", entry.subscribers.count do
- assert_difference "DiaryComment.count", 1 do
- assert_difference "entry.subscribers.count", 1 do
- perform_enqueued_jobs do
- post :comment,
- :params => { :display_name => entry.user.display_name, :id => entry.id, :diary_comment => { :body => "New comment" } },
- :session => { :user => other_user }
- end
- end
- end
- end
- assert_response :redirect
- assert_redirected_to :action => :show, :display_name => entry.user.display_name, :id => entry.id
- email = ActionMailer::Base.deliveries.first
- assert_equal [user.email], email.to
- assert_equal "[OpenStreetMap] #{other_user.display_name} commented on a diary entry", email.subject
- assert_match(/New comment/, email.text_part.decoded)
- assert_match(/New comment/, email.html_part.decoded)
- ActionMailer::Base.deliveries.clear
- comment = DiaryComment.order(:id).last
- assert_equal entry.id, comment.diary_entry_id
- assert_equal other_user.id, comment.user_id
- assert_equal "New comment", comment.body
-
- # Now show the diary entry, and check the new comment is present
- get :show,
- :params => { :display_name => entry.user.display_name, :id => entry.id }
- assert_response :success
- assert_select ".diary-comment", :count => 1 do
- assert_select "#comment#{comment.id}", :count => 1 do
- assert_select "a[href='/user/#{ERB::Util.u(other_user.display_name)}']", :text => other_user.display_name, :count => 1
- end
- assert_select ".richtext", :text => /New comment/, :count => 1
- end
- end
-
- def test_comment_spammy
- user = create(:user)
- other_user = create(:user)
-
- # Find the entry to comment on
- entry = create(:diary_entry, :user => user)
- post :subscribe,
- :params => { :id => entry.id, :display_name => entry.user.display_name },
- :session => { :user => user }
-
- # Generate some spammy content
- spammy_text = 1.upto(50).map { |n| "http://example.com/spam#{n}" }.join(" ")
-
- # Try creating a spammy comment
- assert_difference "ActionMailer::Base.deliveries.size", 1 do
- assert_difference "DiaryComment.count", 1 do
- perform_enqueued_jobs do
- post :comment,
- :params => { :display_name => entry.user.display_name, :id => entry.id, :diary_comment => { :body => spammy_text } },
- :session => { :user => other_user }
- end
- end
- end
- assert_response :redirect
- assert_redirected_to :action => :show, :display_name => entry.user.display_name, :id => entry.id
- email = ActionMailer::Base.deliveries.first
- assert_equal [user.email], email.to
- assert_equal "[OpenStreetMap] #{other_user.display_name} commented on a diary entry", email.subject
- assert_match %r{http://example.com/spam}, email.text_part.decoded
- assert_match %r{http://example.com/spam}, email.html_part.decoded
- ActionMailer::Base.deliveries.clear
- comment = DiaryComment.order(:id).last
- assert_equal entry.id, comment.diary_entry_id
- assert_equal other_user.id, comment.user_id
- assert_equal spammy_text, comment.body
- assert_equal "suspended", User.find(other_user.id).status
-
- # Follow the redirect
- get :index,
- :params => { :display_name => user.display_name },
- :session => { :user => other_user }
- assert_response :redirect
- assert_redirected_to :controller => :users, :action => :suspended
+ session_for(other_user)
+ put diary_entry_path(user, diary_entry, :diary_entry => { :title => "Updated Title" })
+ assert_redirected_to diary_entry_path(user, diary_entry)
+ diary_entry.reload
+ assert_equal "Original Title", diary_entry.title
- # Now show the diary entry, and check the new comment is not present
- get :show,
- :params => { :display_name => entry.user.display_name, :id => entry.id }
- assert_response :success
- assert_select ".diary-comment", :count => 0
+ session_for(user)
+ put diary_entry_path(user, diary_entry, :diary_entry => { :title => "Updated Title" })
+ assert_redirected_to diary_entry_path(user, diary_entry)
+ diary_entry.reload
+ assert_equal "Updated Title", diary_entry.title
end
def test_index_all
@@ -504,7 +365,7 @@ class DiaryEntriesControllerTest < ActionController::TestCase
public_entry = create(:diary_entry, :user => create(:user))
# Try a list of all diary entries
- get :index
+ get diary_entries_path
check_diary_index diary_entry, geo_entry, public_entry
end
@@ -517,11 +378,11 @@ class DiaryEntriesControllerTest < ActionController::TestCase
_other_entry = create(:diary_entry, :user => other_user)
# Try a list of diary entries for a valid user
- get :index, :params => { :display_name => user.display_name }
+ get diary_entries_path(:display_name => user.display_name)
check_diary_index diary_entry, geo_entry
# Try a list of diary entries for an invalid user
- get :index, :params => { :display_name => "No Such User" }
+ get diary_entries_path(:display_name => "No Such User")
assert_response :not_found
assert_template "users/no_such_user"
end
@@ -534,14 +395,15 @@ class DiaryEntriesControllerTest < ActionController::TestCase
_other_entry = create(:diary_entry, :user => other_user)
# Try a list of diary entries for your friends when not logged in
- get :index, :params => { :friends => true }
- assert_response :redirect
- assert_redirected_to :controller => :users, :action => :login, :referer => "/diary/friends"
+ get friends_diary_entries_path
+ assert_redirected_to login_path(:referer => "/diary/friends")
# Try a list of diary entries for your friends when logged in
- get :index, :params => { :friends => true }, :session => { :user => user }
+ session_for(user)
+ get friends_diary_entries_path
check_diary_index diary_entry
- get :index, :params => { :friends => true }, :session => { :user => other_user }
+ session_for(other_user)
+ get friends_diary_entries_path
check_diary_index
end
@@ -552,14 +414,15 @@ class DiaryEntriesControllerTest < ActionController::TestCase
diary_entry = create(:diary_entry, :user => user)
# Try a list of diary entries for nearby users when not logged in
- get :index, :params => { :nearby => true }
- assert_response :redirect
- assert_redirected_to :controller => :users, :action => :login, :referer => "/diary/nearby"
+ get nearby_diary_entries_path
+ assert_redirected_to login_path(:referer => "/diary/nearby")
# Try a list of diary entries for nearby users when logged in
- get :index, :params => { :nearby => true }, :session => { :user => nearby_user }
+ session_for(nearby_user)
+ get nearby_diary_entries_path
check_diary_index diary_entry
- get :index, :params => { :nearby => true }, :session => { :user => user }
+ session_for(user)
+ get nearby_diary_entries_path
check_diary_index
end
@@ -571,15 +434,15 @@ class DiaryEntriesControllerTest < ActionController::TestCase
diary_entry_de = create(:diary_entry, :language_code => "de")
# Try a list of diary entries in english
- get :index, :params => { :language => "en" }
+ get diary_entries_path(:language => "en")
check_diary_index diary_entry_en, diary_entry_en2
# Try a list of diary entries in german
- get :index, :params => { :language => "de" }
+ get diary_entries_path(:language => "de")
check_diary_index diary_entry_de
# Try a list of diary entries in slovenian
- get :index, :params => { :language => "sl" }
+ get diary_entries_path(:language => "sl")
check_diary_index
end
@@ -588,14 +451,50 @@ class DiaryEntriesControllerTest < ActionController::TestCase
create_list(:diary_entry, 50)
# Try and get the index
- get :index
+ get diary_entries_path
assert_response :success
- assert_select "div.diary_post", :count => 20
+ assert_select "article.diary_post", :count => 20
+ assert_select "li.page-item a.page-link", :text => "Older Entries", :count => 1
+ assert_select "li.page-item.disabled span.page-link", :text => "Newer Entries", :count => 1
# Try and get the second page
- get :index, :params => { :page => 2 }
+ get css_select("li.page-item .page-link").last["href"]
assert_response :success
- assert_select "div.diary_post", :count => 20
+ assert_select "article.diary_post", :count => 20
+ assert_select "li.page-item a.page-link", :text => "Older Entries", :count => 1
+ assert_select "li.page-item a.page-link", :text => "Newer Entries", :count => 1
+
+ # Try and get the third page
+ get css_select("li.page-item .page-link").last["href"]
+ assert_response :success
+ assert_select "article.diary_post", :count => 10
+ assert_select "li.page-item.disabled span.page-link", :text => "Older Entries", :count => 1
+ assert_select "li.page-item a.page-link", :text => "Newer Entries", :count => 1
+
+ # Go back to the second page
+ get css_select("li.page-item .page-link").first["href"]
+ assert_response :success
+ assert_select "article.diary_post", :count => 20
+ assert_select "li.page-item a.page-link", :text => "Older Entries", :count => 1
+ assert_select "li.page-item a.page-link", :text => "Newer Entries", :count => 1
+
+ # Go back to the first page
+ get css_select("li.page-item .page-link").first["href"]
+ assert_response :success
+ assert_select "article.diary_post", :count => 20
+ assert_select "li.page-item a.page-link", :text => "Older Entries", :count => 1
+ assert_select "li.page-item.disabled span.page-link", :text => "Newer Entries", :count => 1
+ end
+
+ def test_index_invalid_paged
+ # Try some invalid paged accesses
+ %w[-1 0 fred].each do |id|
+ get diary_entries_path(:before => id)
+ assert_redirected_to :controller => :errors, :action => :bad_request
+
+ get diary_entries_path(:after => id)
+ assert_redirected_to :controller => :errors, :action => :bad_request
+ end
end
def test_rss
@@ -604,7 +503,7 @@ class DiaryEntriesControllerTest < ActionController::TestCase
create(:diary_entry, :language_code => "en")
create(:diary_entry, :language_code => "de")
- get :rss, :params => { :format => :rss }
+ get diary_rss_path
assert_response :success, "Should be able to get a diary RSS"
assert_select "rss", :count => 1 do
assert_select "channel", :count => 1 do
@@ -621,7 +520,7 @@ class DiaryEntriesControllerTest < ActionController::TestCase
create(:diary_entry, :language_code => "en")
create(:diary_entry, :language_code => "de")
- get :rss, :params => { :language => "en", :format => :rss }
+ get diary_rss_path(:language => "en")
assert_response :success, "Should be able to get a specific language diary RSS"
assert_select "rss>channel>item", :count => 2 # , "Diary entries should be filtered by language"
end
@@ -635,7 +534,7 @@ class DiaryEntriesControllerTest < ActionController::TestCase
create(:language, :code => "sl")
create(:diary_entry, :language_code => "en")
- get :rss, :params => { :language => "sl", :format => :rss }
+ get diary_rss_path(:language => "sl")
assert_response :success, "Should be able to get a specific language diary RSS"
assert_select "rss>channel>item", :count => 0 # , "Diary entries should be filtered by language"
end
@@ -647,28 +546,28 @@ class DiaryEntriesControllerTest < ActionController::TestCase
create(:diary_entry, :user => user)
create(:diary_entry, :user => other_user)
- get :rss, :params => { :display_name => user.display_name, :format => :rss }
+ get diary_rss_path(:display_name => user.display_name)
assert_response :success, "Should be able to get a specific users diary RSS"
assert_select "rss>channel>item", :count => 2 # , "Diary entries should be filtered by user"
end
def test_rss_nonexisting_user
# Try a user that has never existed
- get :rss, :params => { :display_name => "fakeUsername76543", :format => :rss }
+ get diary_rss_path(:display_name => "fakeUsername76543")
assert_response :not_found, "Should not be able to get a nonexisting users diary RSS"
# Try a suspended user
- get :rss, :params => { :display_name => create(:user, :suspended).display_name, :format => :rss }
+ get diary_rss_path(:display_name => create(:user, :suspended).display_name)
assert_response :not_found, "Should not be able to get a suspended users diary RSS"
# Try a deleted user
- get :rss, :params => { :display_name => create(:user, :deleted).display_name, :format => :rss }
+ get diary_rss_path(:display_name => create(:user, :deleted).display_name)
assert_response :not_found, "Should not be able to get a deleted users diary RSS"
end
def test_rss_character_escaping
create(:diary_entry, :title => "<script>")
- get :rss, :params => { :format => :rss }
+ get diary_rss_path
assert_match "<title><script></title>", response.body
end
@@ -676,11 +575,11 @@ class DiaryEntriesControllerTest < ActionController::TestCase
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 }
+ get diary_rss_path
assert_select "rss>channel>item", :count => 2
- with_diary_feed_delay(6) do
- get :rss, :params => { :format => :rss }
+ with_settings(:diary_feed_delay => 6) do
+ get diary_rss_path
assert_select "rss>channel>item", :count => 1
end
end
@@ -692,24 +591,41 @@ class DiaryEntriesControllerTest < ActionController::TestCase
# Try a normal entry that should work
diary_entry = create(:diary_entry, :user => user)
- get :show, :params => { :display_name => user.display_name, :id => diary_entry.id }
+ get diary_entry_path(user, diary_entry)
assert_response :success
assert_template :show
+ # Try a non-integer ID
+ get "/user/#{CGI.escape(user.display_name)}/diary/#{diary_entry.id})"
+ assert_response :not_found
+ assert_template "rescues/routing_error"
+
# Try a deleted entry
diary_entry_deleted = create(:diary_entry, :user => user, :visible => false)
- get :show, :params => { :display_name => user.display_name, :id => diary_entry_deleted.id }
+ get diary_entry_path(user, diary_entry_deleted)
assert_response :not_found
# Try an entry by a suspended user
- diary_entry_suspended = create(:diary_entry, :user => suspended_user)
- get :show, :params => { :display_name => suspended_user.display_name, :id => diary_entry_suspended.id }
+ diary_entry_suspended_user = create(:diary_entry, :user => suspended_user)
+ get diary_entry_path(suspended_user, diary_entry_suspended_user)
assert_response :not_found
# Try an entry by a deleted user
- diary_entry_deleted = create(:diary_entry, :user => deleted_user)
- get :show, :params => { :display_name => deleted_user.display_name, :id => diary_entry_deleted.id }
+ diary_entry_deleted_user = create(:diary_entry, :user => deleted_user)
+ get diary_entry_path(deleted_user, diary_entry_deleted_user)
assert_response :not_found
+
+ # Now try as a moderator
+ session_for(create(:moderator_user))
+ get diary_entry_path(user, diary_entry_deleted)
+ assert_response :success
+ assert_template :show
+
+ # Finally try as an administrator
+ session_for(create(:administrator_user))
+ get diary_entry_path(user, diary_entry_deleted)
+ assert_response :success
+ assert_template :show
end
def test_show_hidden_comments
@@ -721,7 +637,7 @@ class DiaryEntriesControllerTest < ActionController::TestCase
deleted_user_comment = create(:diary_comment, :diary_entry => diary_entry, :user => create(:user, :deleted))
hidden_comment = create(:diary_comment, :diary_entry => diary_entry, :visible => false)
- get :show, :params => { :display_name => user.display_name, :id => diary_entry.id }
+ get diary_entry_path(user, diary_entry)
assert_response :success
assert_template :show
assert_select "div.comments" do
@@ -732,168 +648,224 @@ class DiaryEntriesControllerTest < ActionController::TestCase
end
end
- def test_hide
+ def test_show_og_title
user = create(:user)
- diary_entry = create(:diary_entry, :user => user)
+ diary_entry = create(:diary_entry, :user => user, :title => "The Important Blog Post")
- # Try without logging in
- post :hide,
- :params => { :display_name => user.display_name, :id => diary_entry.id }
- assert_response :forbidden
- assert_equal true, DiaryEntry.find(diary_entry.id).visible
+ get diary_entry_path(user, diary_entry)
+ assert_response :success
+ assert_dom "head meta[property='og:title']" do
+ assert_dom "> @content", "The Important Blog Post"
+ end
+ end
- # Now try as a normal user
- post :hide,
- :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 true, DiaryEntry.find(diary_entry.id).visible
+ def test_show_og_image_with_no_image
+ user = create(:user)
+ diary_entry = create(:diary_entry, :user => user, :body => "nothing")
- # Now try as a moderator
- post :hide,
- :params => { :display_name => user.display_name, :id => diary_entry.id },
- :session => { :user => create(:moderator_user) }
- assert_response :redirect
- assert_redirected_to :action => :index, :display_name => user.display_name
- assert_equal false, DiaryEntry.find(diary_entry.id).visible
+ get diary_entry_path(user, diary_entry)
+ assert_response :success
+ assert_dom "head meta[property='og:image']" do
+ assert_dom "> @content", ActionController::Base.helpers.image_url("osm_logo_256.png", :host => root_url)
+ end
+ assert_dom "head meta[property='og:image:alt']" do
+ assert_dom "> @content", "OpenStreetMap logo"
+ end
+ end
- # Reset
- diary_entry.reload.update(:visible => true)
+ def test_show_og_image
+ user = create(:user)
+ diary_entry = create(:diary_entry, :user => user, :body => "")
- # Finally try as an administrator
- post :hide,
- :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 false, DiaryEntry.find(diary_entry.id).visible
+ get diary_entry_path(user, diary_entry)
+ assert_response :success
+ assert_dom "head meta[property='og:image']" do
+ assert_dom "> @content", "https://example.com/picture.jpg"
+ end
+ assert_dom "head meta[property='og:image:alt']" do
+ assert_dom "> @content", "some picture"
+ end
end
- def test_unhide
+ def test_show_og_image_with_relative_uri
user = create(:user)
+ diary_entry = create(:diary_entry, :user => user, :body => "")
- # 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
+ get diary_entry_path(user, diary_entry)
+ assert_response :success
+ assert_dom "head meta[property='og:image']" do
+ assert_dom "> @content", "#{root_url}picture.jpg"
+ end
+ assert_dom "head meta[property='og:image:alt']" do
+ assert_dom "> @content", "some local picture"
+ end
+ end
- # 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
+ def test_show_og_image_with_spaces
+ user = create(:user)
+ diary_entry = create(:diary_entry, :user => user, :body => "")
- # 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
+ get diary_entry_path(user, diary_entry)
+ assert_response :success
+ assert_dom "head meta[property='og:image']" do
+ assert_dom "> @content", "https://example.com/the%20picture.jpg"
+ end
+ assert_dom "head meta[property='og:image:alt']" do
+ assert_dom "> @content", "some picture"
+ end
+ end
+
+ def test_show_og_image_with_relative_uri_and_spaces
+ user = create(:user)
+ diary_entry = create(:diary_entry, :user => user, :body => "")
+
+ get diary_entry_path(user, diary_entry)
+ assert_response :success
+ assert_dom "head meta[property='og:image']" do
+ assert_dom "> @content", "#{root_url}the%20picture.jpg"
+ end
+ assert_dom "head meta[property='og:image:alt']" do
+ assert_dom "> @content", "some local picture"
+ end
+ end
+
+ def test_show_og_image_with_invalid_uri
+ user = create(:user)
+ diary_entry = create(:diary_entry, :user => user, :body => "")
+
+ get diary_entry_path(user, diary_entry)
+ assert_response :success
+ assert_dom "head meta[property='og:image']" do
+ assert_dom "> @content", ActionController::Base.helpers.image_url("osm_logo_256.png", :host => root_url)
+ end
+ assert_dom "head meta[property='og:image:alt']" do
+ assert_dom "> @content", "OpenStreetMap logo"
+ end
end
- def test_hidecomment
+ def test_show_og_image_without_alt
+ user = create(:user)
+ diary_entry = create(:diary_entry, :user => user, :body => "<img src='https://example.com/no_alt.gif'>")
+
+ get diary_entry_path(user, diary_entry)
+ assert_response :success
+ assert_dom "head meta[property='og:image']" do
+ assert_dom "> @content", "https://example.com/no_alt.gif"
+ end
+ assert_dom "head meta[property='og:image:alt']", :count => 0
+ end
+
+ def test_show_no_og_description
+ user = create(:user)
+ diary_entry = create(:diary_entry, :user => user, :body => "")
+
+ get diary_entry_path(user, diary_entry)
+ assert_response :success
+ assert_dom "head meta[property='og:description']" do
+ assert_dom "> @content", I18n.t("layouts.intro_text")
+ end
+ end
+
+ def test_show_og_description
+ user = create(:user)
+ diary_entry = create(:diary_entry, :user => user, :body => "# Hello\n\n\n\nFirst paragraph.\n\nSecond paragraph.")
+
+ get diary_entry_path(user, diary_entry)
+ assert_response :success
+ assert_dom "head meta[property='og:description']" do
+ assert_dom "> @content", "First paragraph."
+ end
+ end
+
+ def test_show_article_published_time
+ user = create(:user)
+ diary_entry = create(:diary_entry, :user => user, :created_at => "2020-03-04")
+
+ get diary_entry_path(user, diary_entry)
+ assert_response :success
+ assert_dom "head meta[property='article:published_time']" do
+ assert_dom "> @content", "2020-03-04T00:00:00Z"
+ end
+ end
+
+ def test_hide
user = create(:user)
diary_entry = create(:diary_entry, :user => user)
- diary_comment = create(:diary_comment, :diary_entry => diary_entry)
# Try without logging in
- post :hidecomment,
- :params => { :display_name => user.display_name, :id => diary_entry.id, :comment => diary_comment.id }
+ post hide_diary_entry_path(user, diary_entry)
assert_response :forbidden
- assert_equal true, DiaryComment.find(diary_comment.id).visible
+ assert DiaryEntry.find(diary_entry.id).visible
# Now try as a normal user
- post :hidecomment,
- :params => { :display_name => user.display_name, :id => diary_entry.id, :comment => diary_comment.id },
- :session => { :user => user }
- assert_response :redirect
+ session_for(user)
+ post hide_diary_entry_path(user, diary_entry)
assert_redirected_to :controller => :errors, :action => :forbidden
- assert_equal true, DiaryComment.find(diary_comment.id).visible
+ assert DiaryEntry.find(diary_entry.id).visible
- # Try as a moderator
- post :hidecomment,
- :params => { :display_name => user.display_name, :id => diary_entry.id, :comment => diary_comment.id },
- :session => { :user => create(:moderator_user) }
- assert_response :redirect
- assert_redirected_to :action => :show, :display_name => user.display_name, :id => diary_entry.id
- assert_equal false, DiaryComment.find(diary_comment.id).visible
+ # Now try as a moderator
+ session_for(create(:moderator_user))
+ post hide_diary_entry_path(user, diary_entry)
+ assert_redirected_to :action => :index, :display_name => user.display_name
+ assert_not DiaryEntry.find(diary_entry.id).visible
# Reset
- diary_comment.reload.update(:visible => true)
+ diary_entry.reload.update(:visible => true)
# Finally try as an administrator
- post :hidecomment,
- :params => { :display_name => user.display_name, :id => diary_entry.id, :comment => diary_comment.id },
- :session => { :user => create(:administrator_user) }
- assert_response :redirect
- assert_redirected_to :action => :show, :display_name => user.display_name, :id => diary_entry.id
- assert_equal false, DiaryComment.find(diary_comment.id).visible
+ session_for(create(:administrator_user))
+ post hide_diary_entry_path(user, diary_entry)
+ assert_redirected_to :action => :index, :display_name => user.display_name
+ assert_not DiaryEntry.find(diary_entry.id).visible
end
- def test_unhidecomment
+ def test_unhide
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 }
+ diary_entry = create(:diary_entry, :user => user, :visible => false)
+ post unhide_diary_entry_path(user, diary_entry)
assert_response :forbidden
- assert_equal false, DiaryComment.find(diary_comment.id).visible
+ assert_not DiaryEntry.find(diary_entry.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
+ session_for(user)
+ post unhide_diary_entry_path(user, diary_entry)
assert_redirected_to :controller => :errors, :action => :forbidden
- assert_equal false, DiaryComment.find(diary_comment.id).visible
+ assert_not DiaryEntry.find(diary_entry.id).visible
+
+ # Now try as a moderator
+ session_for(create(:moderator_user))
+ post unhide_diary_entry_path(user, diary_entry)
+ assert_redirected_to :action => :index, :display_name => user.display_name
+ assert DiaryEntry.find(diary_entry.id).visible
+
+ # Reset
+ diary_entry.reload.update(:visible => true)
# 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
+ session_for(create(:administrator_user))
+ post unhide_diary_entry_path(user, diary_entry)
+ assert_redirected_to :action => :index, :display_name => user.display_name
+ assert DiaryEntry.find(diary_entry.id).visible
end
- def test_comments
+ def test_subscribe_page
user = create(:user)
other_user = create(:user)
- suspended_user = create(:user, :suspended)
- deleted_user = create(:user, :deleted)
- # Test a user with no comments
- get :comments, :params => { :display_name => user.display_name }
- assert_response :success
- assert_template :comments
- assert_select "table.table-striped" do
- assert_select "tr", :count => 1 # header, no comments
- end
+ diary_entry = create(:diary_entry, :user => user)
+ path = diary_entry_subscribe_path(user, diary_entry)
- # Test a user with a comment
- create(:diary_comment, :user => other_user)
+ get path
+ assert_redirected_to login_path(:referer => path)
- get :comments, :params => { :display_name => other_user.display_name }
+ session_for(other_user)
+ get path
assert_response :success
- assert_template :comments
- assert_select "table.table-striped" do
- assert_select "tr", :count => 2 # header and one comment
+ assert_dom ".content-body" do
+ assert_dom "a[href='#{diary_entry_path(user, diary_entry)}']", :text => diary_entry.title
+ assert_dom "a[href='#{user_path(user)}']", :text => user.display_name
end
-
- # Test a suspended user
- get :comments, :params => { :display_name => suspended_user.display_name }
- assert_response :not_found
-
- # Test a deleted user
- get :comments, :params => { :display_name => deleted_user.display_name }
- assert_response :not_found
end
def test_subscribe_success
@@ -901,10 +873,9 @@ class DiaryEntriesControllerTest < ActionController::TestCase
other_user = create(:user)
diary_entry = create(:diary_entry, :user => user)
+ session_for(other_user)
assert_difference "diary_entry.subscribers.count", 1 do
- post :subscribe,
- :params => { :id => diary_entry.id, :display_name => diary_entry.user.display_name },
- :session => { :user => other_user }
+ post diary_entry_subscribe_path(user, diary_entry)
end
assert_response :redirect
end
@@ -917,25 +888,38 @@ class DiaryEntriesControllerTest < ActionController::TestCase
# not signed in
assert_no_difference "diary_entry.subscribers.count" do
- post :subscribe,
- :params => { :id => diary_entry.id, :display_name => diary_entry.user.display_name }
+ post diary_entry_subscribe_path(user, diary_entry)
end
assert_response :forbidden
+ session_for(other_user)
+
# bad diary id
- post :subscribe,
- :params => { :id => 999111, :display_name => "username" },
- :session => { :user => other_user }
+ post diary_entry_subscribe_path("username", 999111)
assert_response :not_found
# trying to subscribe when already subscribed
- post :subscribe,
- :params => { :id => diary_entry.id, :display_name => diary_entry.user.display_name },
- :session => { :user => other_user }
+ post diary_entry_subscribe_path(user, diary_entry)
assert_no_difference "diary_entry.subscribers.count" do
- post :subscribe,
- :params => { :id => diary_entry.id, :display_name => diary_entry.user.display_name },
- :session => { :user => other_user }
+ post diary_entry_subscribe_path(user, diary_entry)
+ end
+ end
+
+ def test_unsubscribe_page
+ user = create(:user)
+ other_user = create(:user)
+ diary_entry = create(:diary_entry, :user => user)
+ path = diary_entry_unsubscribe_path(user, diary_entry)
+
+ get path
+ assert_redirected_to login_path(:referer => path)
+
+ session_for(other_user)
+ get path
+ assert_response :success
+ assert_dom ".content-body" do
+ assert_dom "a[href='#{diary_entry_path(user, diary_entry)}']", :text => diary_entry.title
+ assert_dom "a[href='#{user_path(user)}']", :text => user.display_name
end
end
@@ -944,14 +928,11 @@ class DiaryEntriesControllerTest < ActionController::TestCase
other_user = create(:user)
diary_entry = create(:diary_entry, :user => user)
+ create(:diary_entry_subscription, :diary_entry => diary_entry, :user => other_user)
- post :subscribe,
- :params => { :id => diary_entry.id, :display_name => diary_entry.user.display_name },
- :session => { :user => other_user }
+ session_for(other_user)
assert_difference "diary_entry.subscribers.count", -1 do
- post :unsubscribe,
- :params => { :id => diary_entry.id, :display_name => diary_entry.user.display_name },
- :session => { :user => other_user }
+ post diary_entry_unsubscribe_path(user, diary_entry)
end
assert_response :redirect
end
@@ -964,22 +945,19 @@ class DiaryEntriesControllerTest < ActionController::TestCase
# not signed in
assert_no_difference "diary_entry.subscribers.count" do
- post :unsubscribe,
- :params => { :id => diary_entry.id, :display_name => diary_entry.user.display_name }
+ post diary_entry_unsubscribe_path(user, diary_entry)
end
assert_response :forbidden
+ session_for(other_user)
+
# bad diary id
- post :unsubscribe,
- :params => { :id => 999111, :display_name => "username" },
- :session => { :user => other_user }
+ post diary_entry_unsubscribe_path("username", 999111)
assert_response :not_found
# trying to unsubscribe when not subscribed
assert_no_difference "diary_entry.subscribers.count" do
- post :unsubscribe,
- :params => { :id => diary_entry.id, :display_name => diary_entry.user.display_name },
- :session => { :user => other_user }
+ post diary_entry_unsubscribe_path(user, diary_entry)
end
end
@@ -989,19 +967,10 @@ class DiaryEntriesControllerTest < ActionController::TestCase
assert_response :success
assert_template "index"
assert_no_missing_translations
- assert_select "div.diary_post", entries.count
+ assert_select "article.diary_post", entries.count
entries.each do |entry|
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