X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a32076abd6369b74ac81db5eeffbc40bdf64d597..3726d561ea0f5d363599ef4daf70eafef3abac38:/test/controllers/diary_entry_controller_test.rb diff --git a/test/controllers/diary_entry_controller_test.rb b/test/controllers/diary_entry_controller_test.rb index 77d340ffe..6ebf4ec09 100644 --- a/test/controllers/diary_entry_controller_test.rb +++ b/test/controllers/diary_entry_controller_test.rb @@ -662,8 +662,6 @@ class DiaryEntryControllerTest < ActionController::TestCase assert_response :not_found end - ## - # test subscribe success def test_subscribe_success diary_entry = create(:diary_entry, :user_id => users(:normal_user).id) @@ -673,13 +671,11 @@ class DiaryEntryControllerTest < ActionController::TestCase assert_response :redirect end - ## - # test subscribe fail def test_subscribe_fail diary_entry = create(:diary_entry, :user_id => users(:normal_user).id) # not signed in - assert_no_difference "diary_entry.subscribers.count", 1 do + assert_no_difference "diary_entry.subscribers.count" do post :subscribe, :id => diary_entry.id, :display_name => diary_entry.user.display_name end assert_response :forbidden @@ -691,12 +687,10 @@ class DiaryEntryControllerTest < ActionController::TestCase # trying to subscribe when already subscribed post :subscribe, { :id => diary_entry.id, :display_name => diary_entry.user.display_name }, { :user => users(:public_user).id } assert_no_difference "diary_entry.subscribers.count" do - post :subscribe, { :id => diary_entry.id, :display_name => diary_entry.user.display_name}, { :user => users(:public_user).id } + post :subscribe, { :id => diary_entry.id, :display_name => diary_entry.user.display_name }, { :user => users(:public_user).id } end end - ## - # test unsubscribe success def test_unsubscribe_success diary_entry = create(:diary_entry, :user_id => users(:normal_user).id) @@ -707,8 +701,6 @@ class DiaryEntryControllerTest < ActionController::TestCase assert_response :redirect end - ## - # test unsubscribe fail def test_unsubscribe_fail diary_entry = create(:diary_entry, :user_id => users(:normal_user).id) @@ -722,7 +714,7 @@ class DiaryEntryControllerTest < ActionController::TestCase post :unsubscribe, { :id => 999111, :display_name => "username" }, { :user => users(:public_user).id } assert_response :not_found - # trying to subscribe when already subscribed + # 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 => users(:public_user).id } end