From 22e0c1d8f803dfea5613283528a88a5c7f3f4f6d Mon Sep 17 00:00:00 2001 From: Eugene Dubinin Date: Mon, 23 Jan 2017 17:23:37 +0200 Subject: [PATCH] makes rubocop happy --- app/controllers/admin/events_controller.rb | 7 ++----- app/models/event.rb | 4 ++-- spec/controllers/admin/events_controller_spec.rb | 4 +--- spec/models/event_spec.rb | 4 ++-- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/app/controllers/admin/events_controller.rb b/app/controllers/admin/events_controller.rb index c5f728af..dab7a212 100644 --- a/app/controllers/admin/events_controller.rb +++ b/app/controllers/admin/events_controller.rb @@ -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 diff --git a/app/models/event.rb b/app/models/event.rb index 218bdd87..6aea3216 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -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 diff --git a/spec/controllers/admin/events_controller_spec.rb b/spec/controllers/admin/events_controller_spec.rb index fb6cea6b..a9f98fc8 100644 --- a/spec/controllers/admin/events_controller_spec.rb +++ b/spec/controllers/admin/events_controller_spec.rb @@ -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 diff --git a/spec/models/event_spec.rb b/spec/models/event_spec.rb index ee1e6ada..4225a35c 100644 --- a/spec/models/event_spec.rb +++ b/spec/models/event_spec.rb @@ -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