kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Use a more sensible message for the AbuseReport uniqueness validation

Browse source 
Previously it was "user has already been taken", when really we were
saying the user has already been reported.
This commit is contained in:
Robert Speicher 2016-01-16 16:25:35 -05:00
parent b6e1df7ad4
commit d633755350
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/abuse_report.rb
View file

@ -17,7 +17,7 @@ class AbuseReport < ActiveRecord::Base
validates :reporter, presence: true
validates :user, presence: true
validates :message, presence: true
validates :user_id, uniqueness: true
validates :user_id, uniqueness: { message: 'has already been reported' }
def remove_user
user.block

2
spec/models/abuse_report_spec.rb
View file

@ -26,7 +26,7 @@ RSpec.describe AbuseReport, type: :model do
it { is_expected.to validate_presence_of(:reporter) }
it { is_expected.to validate_presence_of(:user) }
it { is_expected.to validate_presence_of(:message) }
it { is_expected.to validate_uniqueness_of(:user_id) }
it { is_expected.to validate_uniqueness_of(:user_id).with_message('has already been reported') }
end
describe '#remove_user' do