From 03dfcdcc577a9f83437f1ea324913187a0b6475f Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Mon, 8 Jul 2019 09:04:58 +1200 Subject: [PATCH] rubocop lint fix ups --- app/helpers/icons_helper.rb | 2 +- app/services/timeline_service.rb | 5 ++--- spec/services/timeline_service_spec.rb | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/helpers/icons_helper.rb b/app/helpers/icons_helper.rb index 2ca8990d6..168af1052 100644 --- a/app/helpers/icons_helper.rb +++ b/app/helpers/icons_helper.rb @@ -2,7 +2,7 @@ module IconsHelper include FontAwesome::Sass::Rails::ViewHelpers def icon_for_model(the_model) - self.send("#{the_model.class.name.downcase}_icon") + send("#{the_model.class.name.downcase}_icon") end def timeline_icon diff --git a/app/services/timeline_service.rb b/app/services/timeline_service.rb index 23074732b..29db3a1d8 100644 --- a/app/services/timeline_service.rb +++ b/app/services/timeline_service.rb @@ -1,11 +1,11 @@ class TimelineService def self.member_query(member) - self.query.where(owner_id: member.id) + query.where(owner_id: member.id) end # A timeline of events by people the member follows def self.followed_query(member) - self.query.where(owner_id: [member.followed.pluck(:id)]) + query.where(owner_id: [member.followed.pluck(:id)]) end def self.query @@ -100,5 +100,4 @@ class TimelineService 'slug' ) end - end diff --git a/spec/services/timeline_service_spec.rb b/spec/services/timeline_service_spec.rb index e023da518..4562f733f 100644 --- a/spec/services/timeline_service_spec.rb +++ b/spec/services/timeline_service_spec.rb @@ -6,11 +6,11 @@ describe 'timeline' do describe 'followed_by(member)' do let!(:planting) { FactoryBot.create :planting, owner: friend, planted_at: 1.day.ago } let!(:harvest) { FactoryBot.create :harvest, owner: friend, harvested_at: 2.days.ago } - before {friend.followers << member } + before { friend.followers << member } subject { TimelineService.followed_query(member) } it { expect(subject.first).to eq planting } it { expect(TimelineService.resolve_model(subject.second)).to eq harvest } end - describe + describe end