Merge f56cafdaf1 into be33f345a1
This commit is contained in:
commit
d01644d03f
3 changed files with 4 additions and 1 deletions
|
|
@ -38,6 +38,7 @@ class Event < ActiveRecord::Base
|
|||
validate :before_end_of_conference, on: :create
|
||||
validates :title, presence: true
|
||||
validates :abstract, presence: true
|
||||
validates_length_of :abstract, minimum: 20
|
||||
validates :event_type, presence: true
|
||||
validates :program, presence: true
|
||||
validates :speakers, presence: true
|
||||
|
|
|
|||
|
|
@ -184,7 +184,7 @@ class User < ActiveRecord::Base
|
|||
end
|
||||
|
||||
def confirmed?
|
||||
!confirmed_at.nil?
|
||||
confirmed_at.present?
|
||||
end
|
||||
|
||||
def proposals(conference)
|
||||
|
|
|
|||
|
|
@ -22,9 +22,11 @@ describe Event do
|
|||
|
||||
it { is_expected.to validate_presence_of(:title) }
|
||||
it { is_expected.to validate_presence_of(:abstract) }
|
||||
it { should validate_length_of(:abstract).is_at_least(20) }
|
||||
it { is_expected.to validate_presence_of(:program) }
|
||||
it { is_expected.to validate_presence_of(:event_type) }
|
||||
|
||||
|
||||
describe 'max_attendees_no_more_than_room_size' do
|
||||
before :each do
|
||||
unless (venue = event.program.conference.venue)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue