From 693798b3f48afa61d9ccd10f2ba1292c825b00fb Mon Sep 17 00:00:00 2001 From: anandjose-arackal Date: Sat, 20 Aug 2016 17:25:47 +0530 Subject: [PATCH] [#1092] fixed --- app/models/event.rb | 1 - app/views/proposal/new.html.haml | 2 +- spec/models/event_spec.rb | 8 +++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/models/event.rb b/app/models/event.rb index d2446847..990d1b4a 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -30,7 +30,6 @@ class Event < ActiveRecord::Base validate :abstract_limit validate :before_end_of_conference, on: :create validates :title, presence: true - validates :abstract, presence: true validates :event_type, presence: true validates :program, presence: true validates :max_attendees, numericality: { only_integer: true, greater_than_or_equal_to: 1, allow_nil: true } diff --git a/app/views/proposal/new.html.haml b/app/views/proposal/new.html.haml index 5281ec37..e835a8de 100644 --- a/app/views/proposal/new.html.haml +++ b/app/views/proposal/new.html.haml @@ -43,7 +43,7 @@ :javascript $("##{@program.event_types.first.id}-help").collapse('show'); - = f.input :abstract, required: true, input_html: { rows: 5, data: { provide: 'markdown-editable' } }, + = f.input :abstract, input_html: { rows: 5, data: { provide: 'markdown-editable' } }, hint: markdown_hint(link_to('Tips to improve your presentations.', 'http://blog.hubspot.com/blog/tabid/6307/bid/5975/10-Rules-to-Instantly-Improve-Your-Presentations.aspx')) %p diff --git a/spec/models/event_spec.rb b/spec/models/event_spec.rb index f9c46559..20730f46 100644 --- a/spec/models/event_spec.rb +++ b/spec/models/event_spec.rb @@ -21,7 +21,6 @@ describe Event do end it { is_expected.to validate_presence_of(:title) } - it { is_expected.to validate_presence_of(:abstract) } it { is_expected.to validate_presence_of(:program) } it { is_expected.to validate_presence_of(:event_type) } @@ -75,6 +74,13 @@ describe Event do expect(event.valid?).to eq true expect(event.errors.size).to eq 0 end + + it 'when abstract is empty and minimum_abstract_length equal to zero' do + event.abstract = '' + event.event_type.minimum_abstract_length = 0 + expect(event.valid?).to eq true + expect(event.errors.size).to eq 0 + end end end