X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/31edc7dff6f4305366d0f93d35ba3fb1956bb71f..c12f8959dd2059b4ea9d45caf716923d7589cbb0:/test/system/diary_entry_test.rb?ds=inline diff --git a/test/system/diary_entry_test.rb b/test/system/diary_entry_test.rb index 38e2a1847..554b89a6d 100644 --- a/test/system/diary_entry_test.rb +++ b/test/system/diary_entry_test.rb @@ -10,9 +10,9 @@ class DiaryEntrySystemTest < ApplicationSystemTestCase sign_in_as(create(:user)) visit diary_entries_path - click_on "Reply to this entry" + click_link "Send a message to the author" - assert page.has_content? "Send a new message" + assert_content "Send a new message" assert_equal "Re: #{@diary_entry.title}", page.find_field("Subject").value end @@ -22,7 +22,7 @@ class DiaryEntrySystemTest < ApplicationSystemTestCase sign_in_as(create(:user)) visit diary_entries_path - assert_not page.has_content? @deleted_entry.title + assert_no_content @deleted_entry.title end test "deleted diary entries should be shown to administrators for review" do @@ -31,17 +31,17 @@ class DiaryEntrySystemTest < ApplicationSystemTestCase sign_in_as(create(:administrator_user)) visit diary_entries_path - assert page.has_content? @deleted_entry.title + assert_content @deleted_entry.title end test "deleted diary entries should not be shown to admins when the user is also deleted" do - @deleted_user = create(:user, :status => :deleted) + @deleted_user = create(:user, :deleted) @deleted_entry = create(:diary_entry, :visible => false, :user => @deleted_user) sign_in_as(create(:administrator_user)) visit diary_entries_path - assert_not page.has_content? @deleted_entry.title + assert_no_content @deleted_entry.title end test "deleted diary comments should be hidden for regular users" do @@ -50,7 +50,7 @@ class DiaryEntrySystemTest < ApplicationSystemTestCase sign_in_as(create(:user)) visit diary_entry_path(@diary_entry.user, @diary_entry) - assert_not page.has_content? @deleted_comment.body + assert_no_content @deleted_comment.body end test "deleted diary comments should be shown to administrators" do @@ -59,6 +59,6 @@ class DiaryEntrySystemTest < ApplicationSystemTestCase sign_in_as(create(:administrator_user)) visit diary_entry_path(@diary_entry.user, @diary_entry) - assert page.has_content? @deleted_comment.body + assert_content @deleted_comment.body end end