From: Anton Khorev Date: Thu, 12 Sep 2024 12:42:36 +0000 (+0300) Subject: Fix friendships limit flash message X-Git-Tag: live~132^2 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/9c93fe906d4556bfbca94f5a826ebb9e3467d362?hp=-c Fix friendships limit flash message --- 9c93fe906d4556bfbca94f5a826ebb9e3467d362 diff --git a/app/controllers/friendships_controller.rb b/app/controllers/friendships_controller.rb index ab54cbfd1..8f0c1ad85 100644 --- a/app/controllers/friendships_controller.rb +++ b/app/controllers/friendships_controller.rb @@ -20,7 +20,7 @@ class FriendshipsController < ApplicationController if current_user.friends_with?(@friend) flash[:warning] = t ".already_a_friend", :name => @friend.display_name elsif current_user.friendships.where(:created_at => Time.now.utc - 1.hour..).count >= current_user.max_friends_per_hour - flash.now[:error] = t ".limit_exceeded" + flash[:error] = t ".limit_exceeded" elsif friendship.save flash[:notice] = t ".success", :name => @friend.display_name UserMailer.friendship_notification(friendship).deliver_later diff --git a/test/system/friendships_test.rb b/test/system/friendships_test.rb new file mode 100644 index 000000000..1db4d3c25 --- /dev/null +++ b/test/system/friendships_test.rb @@ -0,0 +1,18 @@ +require "application_system_test_case" + +class FriendshipsTest < ApplicationSystemTestCase + test "show message when max frienships limit is exceeded" do + befriendee = create(:user) + + sign_in_as create(:user) + + with_settings(:max_friends_per_hour => 0) do + visit user_path(befriendee) + assert_link "Add Friend" + + click_on "Add Friend" + assert_text "You have friended a lot of users recently" + assert_link "Add Friend" + end + end +end