summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-01-16 16:25:35 -0500
committerRobert Speicher <rspeicher@gmail.com>2016-01-16 16:50:43 -0500
commitd633755350f1549d4643ac527980c9b28aa1287c (patch)
treeebc01173b6b22ae50f7e5526c2dd6d54c6841a1b
parentb6e1df7ad4cc8854087355eececd0cd12e7eab74 (diff)
downloadgitlab-ce-rs-abuse-report-validation.tar.gz
Use a more sensible message for the AbuseReport uniqueness validationrs-abuse-report-validation
Previously it was "user has already been taken", when really we were saying the user has already been reported.
-rw-r--r--app/models/abuse_report.rb2
-rw-r--r--spec/models/abuse_report_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/abuse_report.rb b/app/models/abuse_report.rb
index 2bc15c60d57..cc59aa4e911 100644
--- a/app/models/abuse_report.rb
+++ b/app/models/abuse_report.rb
@@ -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
diff --git a/spec/models/abuse_report_spec.rb b/spec/models/abuse_report_spec.rb
index f9be8fcbcfe..4799bbaa57c 100644
--- a/spec/models/abuse_report_spec.rb
+++ b/spec/models/abuse_report_spec.rb
@@ -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