From bec13df13162b3660f0ebaa7ca8c8da48cdc78e6 Mon Sep 17 00:00:00 2001 From: Henne Vogelsang Date: Tue, 19 Feb 2019 20:35:59 +0100 Subject: [PATCH] Adopt more specs to the shoulda-matchers update --- app/models/cfp.rb | 2 +- spec/models/cfp_spec.rb | 2 +- spec/models/user_spec.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/cfp.rb b/app/models/cfp.rb index 052e45ce..6571e701 100644 --- a/app/models/cfp.rb +++ b/app/models/cfp.rb @@ -18,7 +18,7 @@ class Cfp < ApplicationRecord in: TYPES }, uniqueness: { - scope: :program, + scope: :program_id, case_sensitive: false } diff --git a/spec/models/cfp_spec.rb b/spec/models/cfp_spec.rb index f836c560..74d16907 100644 --- a/spec/models/cfp_spec.rb +++ b/spec/models/cfp_spec.rb @@ -10,7 +10,7 @@ describe Cfp do describe 'validations' do it { is_expected.to validate_presence_of(:cfp_type) } it { is_expected.to validate_inclusion_of(:cfp_type).in_array(Cfp::TYPES) } - it { is_expected.to validate_uniqueness_of(:cfp_type).scoped_to(:program_id).case_insensitive } + it { is_expected.to validate_uniqueness_of(:cfp_type).ignoring_case_sensitivity.scoped_to(:program_id) } end describe '.for_events' do diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 5396a987..cdfc4893 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -27,7 +27,7 @@ describe User do it { is_expected.to validate_presence_of(:email) } it { is_expected.to validate_presence_of(:username) } - it { is_expected.to validate_uniqueness_of(:username) } + it { is_expected.to validate_uniqueness_of(:username).ignoring_case_sensitivity } it 'biography can not have more than 150 words' do # Text with 151 words