makes rubocop happy
This commit is contained in:
parent
b86c03f898
commit
22e0c1d8f8
4 changed files with 7 additions and 12 deletions
|
|
@ -79,7 +79,6 @@ module Admin
|
|||
|
||||
def update
|
||||
if @event.update_attributes(event_params)
|
||||
|
||||
if request.xhr?
|
||||
render js: 'index'
|
||||
else
|
||||
|
|
@ -101,10 +100,8 @@ module Admin
|
|||
# make event confirmed initially since there is not much sens to go over the approval procedure for admin-added proposals
|
||||
@event.state = :confirmed
|
||||
if @event.valid?
|
||||
@event.event_users.new(user_id: @event.submitter_id,
|
||||
event_role: 'submitter')
|
||||
@event.event_users.new(user_id: @event.speaker_id,
|
||||
event_role: 'speaker')
|
||||
@event.event_users.new(user_id: @event.submitter_id, event_role: 'submitter')
|
||||
@event.event_users.new(user_id: @event.speaker_id, event_role: 'speaker')
|
||||
end
|
||||
|
||||
if @event.save
|
||||
|
|
|
|||
|
|
@ -305,12 +305,12 @@ class Event < ActiveRecord::Base
|
|||
if validate_owners
|
||||
errors.add(:speaker_id, "can't be blank!") unless self.speaker_id.present?
|
||||
if self.speaker_id.present?
|
||||
errors.add(:speaker_id, "user should exist!") unless User.where(id: self.speaker_id).take
|
||||
errors.add(:speaker_id, 'user should exist!') unless User.where(id: self.speaker_id).take
|
||||
end
|
||||
|
||||
errors.add(:submitter_id, "can't be blank!") unless self.submitter_id.present?
|
||||
if self.submitter_id.present?
|
||||
errors.add(:submitter_id, "user should exist!") unless User.where(id: self.submitter_id).take
|
||||
errors.add(:submitter_id, 'user should exist!') unless User.where(id: self.submitter_id).take
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -77,9 +77,7 @@ describe Admin::EventsController do
|
|||
it 'does not create new event' do
|
||||
allow_any_instance_of(Event).to receive(:save).and_return(false)
|
||||
expect do
|
||||
post :create, event: attributes_for(:event, event_type_id: event_type.id),
|
||||
conference_id: conference.short_title,
|
||||
user: attributes_for(:user)
|
||||
post :create, event: attributes_for(:event, event_type_id: event_type.id), conference_id: conference.short_title, user: attributes_for(:user)
|
||||
end.not_to change{ Event.count }
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -114,12 +114,12 @@ describe Event do
|
|||
it 'when submitter is is provided but the user does not exist' do
|
||||
@new_event.submitter_id = 'deadbeef'
|
||||
expect(@new_event).to be_invalid
|
||||
expect(@new_event.errors[:submitter_id]).to eq ["user should exist!"]
|
||||
expect(@new_event.errors[:submitter_id]).to eq ['user should exist!']
|
||||
end
|
||||
it 'when speaker id is provided but the user does not exist' do
|
||||
@new_event.speaker_id = 'deadbeef'
|
||||
expect(@new_event).to be_invalid
|
||||
expect(@new_event.errors[:speaker_id]).to eq ["user should exist!"]
|
||||
expect(@new_event.errors[:speaker_id]).to eq ['user should exist!']
|
||||
end
|
||||
end
|
||||
context 'is valid with owner validation enabled' do
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue