Commit d6337553 authored by Robert Speicher's avatar Robert Speicher

Use a more sensible message for the AbuseReport uniqueness validation

Previously it was "user has already been taken", when really we were
saying the user has already been reported.
parent b6e1df7a
...@@ -17,7 +17,7 @@ class AbuseReport < ActiveRecord::Base ...@@ -17,7 +17,7 @@ class AbuseReport < ActiveRecord::Base
validates :reporter, presence: true validates :reporter, presence: true
validates :user, presence: true validates :user, presence: true
validates :message, presence: true validates :message, presence: true
validates :user_id, uniqueness: true validates :user_id, uniqueness: { message: 'has already been reported' }
def remove_user def remove_user
user.block user.block
......
...@@ -26,7 +26,7 @@ RSpec.describe AbuseReport, type: :model do ...@@ -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(:reporter) }
it { is_expected.to validate_presence_of(:user) } it { is_expected.to validate_presence_of(:user) }
it { is_expected.to validate_presence_of(:message) } 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 end
describe '#remove_user' do describe '#remove_user' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment