X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/737a325f2e4b45b26277de7986325705ff17b63d..b00b9ce6265fea04e484e7a0555f9dd37aceb713:/test/controllers/diary_entry_controller_test.rb?ds=sidebyside diff --git a/test/controllers/diary_entry_controller_test.rb b/test/controllers/diary_entry_controller_test.rb index 045ec2048..49d56c4e4 100644 --- a/test/controllers/diary_entry_controller_test.rb +++ b/test/controllers/diary_entry_controller_test.rb @@ -109,7 +109,7 @@ class DiaryEntryControllerTest < ActionController::TestCase def test_new_form # Now try again when logged in - get :new, {}, { :user => create(:normal_user).id } + get :new, {}, { :user => create(:user) } assert_response :success assert_select "title", :text => /New Diary Entry/, :count => 1 assert_select "div.content-heading", :count => 1 do @@ -136,7 +136,7 @@ class DiaryEntryControllerTest < ActionController::TestCase get :new, { :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" } }, - { :user => create(:normal_user).id } + { :user => create(:user).id } end assert_response :success assert_template :edit @@ -144,7 +144,7 @@ class DiaryEntryControllerTest < ActionController::TestCase def test_new_no_body # Now try creating a invalid diary entry with an empty body - user = create(:normal_user) + user = create(:user) assert_no_difference "DiaryEntry.count" do post :new, { :commit => "save", :diary_entry => { :title => "New Title", :body => "", :latitude => "1.1", @@ -159,7 +159,7 @@ class DiaryEntryControllerTest < ActionController::TestCase def test_new_post # Now try creating a diary entry - user = create(:normal_user) + user = create(:user) assert_difference "DiaryEntry.count", 1 do post :new, { :commit => "save", :diary_entry => { :title => "New Title", :body => "This is a new body for the diary entry", :latitude => "1.1", @@ -184,7 +184,7 @@ class DiaryEntryControllerTest < ActionController::TestCase def test_new_german create(:language, :code => "de") - user = create(:normal_user) + user = create(:user) # Now try creating a diary entry in a different language assert_difference "DiaryEntry.count", 1 do @@ -210,7 +210,7 @@ class DiaryEntryControllerTest < ActionController::TestCase end def test_new_spammy - user = create(:normal_user) + user = create(: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(" ") @@ -231,14 +231,14 @@ class DiaryEntryControllerTest < ActionController::TestCase assert_equal "suspended", User.find(user.id).status # Follow the redirect - get :list, { :display_name => user.display_name }, { :user => user.id } + get :list, { :display_name => user.display_name }, { :user => user } assert_response :redirect assert_redirected_to :controller => :user, :action => :suspended end def test_edit - user = create(:normal_user) - other_user = create(:normal_user) + user = create(:user) + other_user = create(:user) entry = create(:diary_entry, :user => user) @@ -249,7 +249,7 @@ class DiaryEntryControllerTest < ActionController::TestCase assert_redirected_to :controller => :user, :action => :login, :referer => "/user/#{URI.encode(entry.user.display_name)}/diary/#{entry.id}/edit" # Verify that you get a not found error, when you pass a bogus id - get :edit, { :display_name => entry.user.display_name, :id => 9999 }, { :user => entry.user.id } + get :edit, { :display_name => entry.user.display_name, :id => 9999 }, { :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 @@ -257,13 +257,13 @@ class DiaryEntryControllerTest < ActionController::TestCase # Verify that you get redirected to view if you are not the user # that created the entry - get :edit, { :display_name => entry.user.display_name, :id => entry.id }, { :user => other_user.id } + get :edit, { :display_name => entry.user.display_name, :id => entry.id }, { :user => other_user } assert_response :redirect assert_redirected_to :action => :view, :display_name => entry.user.display_name, :id => entry.id # 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, { :display_name => entry.user.display_name, :id => entry.id }, { :user => entry.user.id } + get :edit, { :display_name => entry.user.display_name, :id => entry.id }, { :user => entry.user } assert_response :success assert_select "title", :text => /Edit diary entry/, :count => 1 assert_select "div.content-heading", :count => 1 do @@ -297,7 +297,7 @@ class DiaryEntryControllerTest < ActionController::TestCase assert_redirected_to :action => :view, :display_name => entry.user.display_name, :id => entry.id # Now check that the new data is rendered, when logged in - get :view, { :display_name => entry.user.display_name, :id => entry.id }, { :user => entry.user.id } + get :view, { :display_name => entry.user.display_name, :id => entry.id }, { :user => entry.user } assert_response :success assert_template "diary_entry/view" assert_select "title", :text => /Users' diaries | /, :count => 1 @@ -316,7 +316,7 @@ class DiaryEntryControllerTest < ActionController::TestCase end # and when not logged in as the user who wrote the entry - get :view, { :display_name => entry.user.display_name, :id => entry.id }, { :user => entry.user.id } + get :view, { :display_name => entry.user.display_name, :id => entry.id }, { :user => entry.user } assert_response :success assert_template "diary_entry/view" assert_select "title", :text => /Users' diaries | /, :count => 1 @@ -337,16 +337,16 @@ class DiaryEntryControllerTest < ActionController::TestCase end def test_edit_i18n - user = create(:normal_user) + user = create(:user) diary_entry = create(:diary_entry, :language_code => "en", :user => user) - get :edit, { :display_name => user.display_name, :id => diary_entry.id }, { :user => user.id } + get :edit, { :display_name => user.display_name, :id => diary_entry.id }, { :user => user } assert_response :success assert_select "span[class=translation_missing]", false, "Missing translation in edit diary entry" end def test_comment - user = create(:normal_user) - other_user = create(:normal_user) + user = create(:user) + other_user = create(:user) entry = create(:diary_entry, :user => user) # Make sure that you are denied when you are not logged in @@ -354,19 +354,19 @@ class DiaryEntryControllerTest < ActionController::TestCase assert_response :forbidden # Verify that you get a not found error, when you pass a bogus id - post :comment, { :display_name => entry.user.display_name, :id => 9999 }, { :user => other_user.id } + post :comment, { :display_name => entry.user.display_name, :id => 9999 }, { :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, { :id => entry.id, :display_name => entry.user.display_name }, { :user => user.id } + post :subscribe, { :id => entry.id, :display_name => entry.user.display_name }, { :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 - post :comment, { :display_name => entry.user.display_name, :id => entry.id, :diary_comment => { :body => "" } }, { :user => other_user.id } + post :comment, { :display_name => entry.user.display_name, :id => entry.id, :diary_comment => { :body => "" } }, { :user => other_user } end end end @@ -377,7 +377,7 @@ class DiaryEntryControllerTest < ActionController::TestCase assert_difference "ActionMailer::Base.deliveries.size", entry.subscribers.count do assert_difference "DiaryComment.count", 1 do assert_difference "entry.subscribers.count", 1 do - post :comment, { :display_name => entry.user.display_name, :id => entry.id, :diary_comment => { :body => "New comment" } }, { :user => other_user.id } + post :comment, { :display_name => entry.user.display_name, :id => entry.id, :diary_comment => { :body => "New comment" } }, { :user => other_user } end end end @@ -406,12 +406,12 @@ class DiaryEntryControllerTest < ActionController::TestCase end def test_comment_spammy - user = create(:normal_user) - other_user = create(:normal_user) + user = create(:user) + other_user = create(:user) # Find the entry to comment on entry = create(:diary_entry, :user => user) - post :subscribe, { :id => entry.id, :display_name => entry.user.display_name }, { :user => user.id } + post :subscribe, { :id => entry.id, :display_name => entry.user.display_name }, { :user => user } # Generate some spammy content spammy_text = 1.upto(50).map { |n| "http://example.com/spam#{n}" }.join(" ") @@ -419,7 +419,7 @@ class DiaryEntryControllerTest < ActionController::TestCase # Try creating a spammy comment assert_difference "ActionMailer::Base.deliveries.size", 1 do assert_difference "DiaryComment.count", 1 do - post :comment, { :display_name => entry.user.display_name, :id => entry.id, :diary_comment => { :body => spammy_text } }, { :user => other_user.id } + post :comment, { :display_name => entry.user.display_name, :id => entry.id, :diary_comment => { :body => spammy_text } }, { :user => other_user } end end assert_response :redirect @@ -437,7 +437,7 @@ class DiaryEntryControllerTest < ActionController::TestCase assert_equal "suspended", User.find(other_user.id).status # Follow the redirect - get :list, { :display_name => user.display_name }, { :user => other_user.id } + get :list, { :display_name => user.display_name }, { :user => other_user } assert_response :redirect assert_redirected_to :controller => :user, :action => :suspended @@ -450,7 +450,7 @@ class DiaryEntryControllerTest < ActionController::TestCase def test_list_all diary_entry = create(:diary_entry) geo_entry = create(:diary_entry, :latitude => 51.50763, :longitude => -0.10781) - public_entry = create(:diary_entry, :user => create(:normal_user)) + public_entry = create(:diary_entry, :user => create(:user)) # Try a list of all diary entries get :list @@ -458,8 +458,8 @@ class DiaryEntryControllerTest < ActionController::TestCase end def test_list_user - user = create(:normal_user) - other_user = create(:normal_user) + user = create(:user) + other_user = create(:user) diary_entry = create(:diary_entry, :user => user) geo_entry = create(:diary_entry, :user => user, :latitude => 51.50763, :longitude => -0.10781) @@ -476,8 +476,8 @@ class DiaryEntryControllerTest < ActionController::TestCase end def test_list_friends - user = create(:normal_user) - other_user = create(:normal_user) + user = create(:user) + other_user = create(:user) friend = create(:friend, :befriender => user) diary_entry = create(:diary_entry, :user => friend.befriendee) _other_entry = create(:diary_entry, :user => other_user) @@ -488,15 +488,15 @@ class DiaryEntryControllerTest < ActionController::TestCase assert_redirected_to :controller => :user, :action => :login, :referer => "/diary/friends" # Try a list of diary entries for your friends when logged in - get :list, { :friends => true }, { :user => user.id } + get :list, { :friends => true }, { :user => user } check_diary_list diary_entry - get :list, { :friends => true }, { :user => other_user.id } + get :list, { :friends => true }, { :user => other_user } check_diary_list end def test_list_nearby - user = create(:normal_user, :home_lat => 12, :home_lon => 12) - nearby_user = create(:normal_user, :home_lat => 11.9, :home_lon => 12.1) + user = create(:user, :home_lat => 12, :home_lon => 12) + nearby_user = create(:user, :home_lat => 11.9, :home_lon => 12.1) diary_entry = create(:diary_entry, :user => user) @@ -506,9 +506,9 @@ class DiaryEntryControllerTest < ActionController::TestCase assert_redirected_to :controller => :user, :action => :login, :referer => "/diary/nearby" # Try a list of diary entries for nearby users when logged in - get :list, { :nearby => true }, { :user => nearby_user.id } + get :list, { :nearby => true }, { :user => nearby_user } check_diary_list diary_entry - get :list, { :nearby => true }, { :user => user.id } + get :list, { :nearby => true }, { :user => user } check_diary_list end @@ -575,8 +575,8 @@ class DiaryEntryControllerTest < ActionController::TestCase end def test_rss_user - user = create(:normal_user) - other_user = create(:normal_user) + user = create(:user) + other_user = create(:user) create(:diary_entry, :user => user) create(:diary_entry, :user => user) create(:diary_entry, :user => other_user) @@ -608,7 +608,7 @@ class DiaryEntryControllerTest < ActionController::TestCase end def test_view - user = create(:normal_user) + user = create(:user) suspended_user = create(:user, :suspended) deleted_user = create(:user, :deleted) @@ -636,7 +636,7 @@ class DiaryEntryControllerTest < ActionController::TestCase def test_view_hidden_comments # Get a diary entry that has hidden comments - user = create(:normal_user) + user = create(:user) diary_entry = create(:diary_entry, :user => user) visible_comment = create(:diary_comment, :diary_entry => diary_entry) suspended_user_comment = create(:diary_comment, :diary_entry => diary_entry, :user => create(:user, :suspended)) @@ -655,7 +655,7 @@ class DiaryEntryControllerTest < ActionController::TestCase end def test_hide - user = create(:normal_user) + user = create(:user) # Try without logging in diary_entry = create(:diary_entry, :user => user) @@ -664,21 +664,21 @@ class DiaryEntryControllerTest < ActionController::TestCase assert_equal true, DiaryEntry.find(diary_entry.id).visible # Now try as a normal user - post :hide, { :display_name => user.display_name, :id => diary_entry.id }, { :user => user.id } + post :hide, { :display_name => user.display_name, :id => diary_entry.id }, { :user => user } assert_response :redirect assert_redirected_to :action => :view, :display_name => user.display_name, :id => diary_entry.id assert_equal true, DiaryEntry.find(diary_entry.id).visible # Finally try as an administrator - post :hide, { :display_name => user.display_name, :id => diary_entry.id }, { :user => create(:administrator_user, :status => "confirmed", :terms_seen => true).id } + post :hide, { :display_name => user.display_name, :id => diary_entry.id }, { :user => create(:administrator_user) } assert_response :redirect assert_redirected_to :action => :list, :display_name => user.display_name assert_equal false, DiaryEntry.find(diary_entry.id).visible end def test_hidecomment - user = create(:normal_user) - administrator_user = create(:administrator_user, :status => "active", :terms_seen => true) + user = create(:user) + administrator_user = create(:administrator_user) diary_entry = create(:diary_entry, :user => user) diary_comment = create(:diary_comment, :diary_entry => diary_entry) # Try without logging in @@ -687,23 +687,23 @@ class DiaryEntryControllerTest < ActionController::TestCase assert_equal true, DiaryComment.find(diary_comment.id).visible # Now try as a normal user - post :hidecomment, { :display_name => user.display_name, :id => diary_entry.id, :comment => diary_comment.id }, { :user => user.id } + post :hidecomment, { :display_name => user.display_name, :id => diary_entry.id, :comment => diary_comment.id }, { :user => user } assert_response :redirect assert_redirected_to :action => :view, :display_name => user.display_name, :id => diary_entry.id assert_equal true, DiaryComment.find(diary_comment.id).visible # Finally try as an administrator - post :hidecomment, { :display_name => user.display_name, :id => diary_entry.id, :comment => diary_comment.id }, { :user => administrator_user.id } + post :hidecomment, { :display_name => user.display_name, :id => diary_entry.id, :comment => diary_comment.id }, { :user => administrator_user } assert_response :redirect assert_redirected_to :action => :view, :display_name => user.display_name, :id => diary_entry.id assert_equal false, DiaryComment.find(diary_comment.id).visible end def test_comments - user = create(:normal_user) - other_user = create(:normal_user) - suspended_user = create(:normal_user, :suspended) - deleted_user = create(:normal_user, :deleted) + 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, :display_name => user.display_name assert_response :success @@ -732,19 +732,19 @@ class DiaryEntryControllerTest < ActionController::TestCase end def test_subscribe_success - user = create(:normal_user) - other_user = create(:normal_user) + user = create(:user) + other_user = create(:user) diary_entry = create(:diary_entry, :user => user) assert_difference "diary_entry.subscribers.count", 1 do - post :subscribe, { :id => diary_entry.id, :display_name => diary_entry.user.display_name }, { :user => other_user.id } + post :subscribe, { :id => diary_entry.id, :display_name => diary_entry.user.display_name }, { :user => other_user } end assert_response :redirect end def test_subscribe_fail - user = create(:normal_user) - other_user = create(:normal_user) + user = create(:user) + other_user = create(:user) diary_entry = create(:diary_entry, :user => user) @@ -755,32 +755,32 @@ class DiaryEntryControllerTest < ActionController::TestCase assert_response :forbidden # bad diary id - post :subscribe, { :id => 999111, :display_name => "username" }, { :user => other_user.id } + post :subscribe, { :id => 999111, :display_name => "username" }, { :user => other_user } assert_response :not_found # trying to subscribe when already subscribed - post :subscribe, { :id => diary_entry.id, :display_name => diary_entry.user.display_name }, { :user => other_user.id } + post :subscribe, { :id => diary_entry.id, :display_name => diary_entry.user.display_name }, { :user => other_user } assert_no_difference "diary_entry.subscribers.count" do - post :subscribe, { :id => diary_entry.id, :display_name => diary_entry.user.display_name }, { :user => other_user.id } + post :subscribe, { :id => diary_entry.id, :display_name => diary_entry.user.display_name }, { :user => other_user } end end def test_unsubscribe_success - user = create(:normal_user) - other_user = create(:normal_user) + user = create(:user) + other_user = create(:user) diary_entry = create(:diary_entry, :user => user) - post :subscribe, { :id => diary_entry.id, :display_name => diary_entry.user.display_name }, { :user => other_user.id } + post :subscribe, { :id => diary_entry.id, :display_name => diary_entry.user.display_name }, { :user => other_user } assert_difference "diary_entry.subscribers.count", -1 do - post :unsubscribe, { :id => diary_entry.id, :display_name => diary_entry.user.display_name }, { :user => other_user.id } + post :unsubscribe, { :id => diary_entry.id, :display_name => diary_entry.user.display_name }, { :user => other_user } end assert_response :redirect end def test_unsubscribe_fail - user = create(:normal_user) - other_user = create(:normal_user) + user = create(:user) + other_user = create(:user) diary_entry = create(:diary_entry, :user => user) @@ -791,12 +791,12 @@ class DiaryEntryControllerTest < ActionController::TestCase assert_response :forbidden # bad diary id - post :unsubscribe, { :id => 999111, :display_name => "username" }, { :user => other_user.id } + post :unsubscribe, { :id => 999111, :display_name => "username" }, { :user => other_user } assert_response :not_found # trying to unsubscribe when not subscribed assert_no_difference "diary_entry.subscribers.count" do - post :unsubscribe, { :id => diary_entry.id, :display_name => diary_entry.user.display_name }, { :user => other_user.id } + post :unsubscribe, { :id => diary_entry.id, :display_name => diary_entry.user.display_name }, { :user => other_user } end end