From a4c1d1386961c274197db2f8bb6ae1d20ef0a75a Mon Sep 17 00:00:00 2001 From: ellnix <103502144+ellnix@users.noreply.github.com> Date: Wed, 28 Feb 2024 20:01:58 +0100 Subject: [PATCH] Fix linter problems --- .rubocop.yml | 3 +++ spec/integration/sequel/record_is_created_spec.rb | 4 ++-- spec/integration_spec.rb | 1 - spec/multi_search_spec.rb | 2 +- spec/support/active_record_classes.rb | 1 - spec/support/active_record_schema.rb | 2 +- spec/support/models/animals.rb | 1 - spec/support/models/book.rb | 1 - spec/support/models/color.rb | 1 - spec/support/models/fruit.rb | 2 -- spec/support/models/movie.rb | 1 - spec/support/models/people.rb | 1 - spec/support/models/post.rb | 1 - spec/support/models/product.rb | 1 - spec/support/models/queued_models.rb | 1 - spec/support/models/restaurant.rb | 1 - spec/support/models/song.rb | 1 - spec/support/models/vegetable.rb | 1 - spec/support/sequel_db.rb | 1 - spec/support/sequel_models/book.rb | 1 - 20 files changed, 7 insertions(+), 21 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 8f90fcf4..960e3958 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -31,6 +31,9 @@ Style/FrozenStringLiteralComment: RSpec/MultipleExpectations: Enabled: false +RSpec/DescribeClass: + Enabled: false + Metrics/BlockLength: Enabled: true Exclude: diff --git a/spec/integration/sequel/record_is_created_spec.rb b/spec/integration/sequel/record_is_created_spec.rb index 29d65629..f5c55687 100644 --- a/spec/integration/sequel/record_is_created_spec.rb +++ b/spec/integration/sequel/record_is_created_spec.rb @@ -14,8 +14,8 @@ end it 'does not override after hooks' do - expect(SequelBook).to receive(:new).twice.and_call_original + allow(SequelBook).to receive(:new).and_call_original SequelBook.create name: 'Steve Jobs', author: 'Walter Isaacson', premium: true, released: true + expect(SequelBook).to have_received(:new).twice end end - diff --git a/spec/integration_spec.rb b/spec/integration_spec.rb index 3210d30e..03a176a2 100644 --- a/spec/integration_spec.rb +++ b/spec/integration_spec.rb @@ -1,6 +1,5 @@ require 'spec_helper' - if defined?(ActiveModel::Serializer) describe 'SerializedDocument' do before(:all) do diff --git a/spec/multi_search_spec.rb b/spec/multi_search_spec.rb index c8f9ed17..14ca7755 100644 --- a/spec/multi_search_spec.rb +++ b/spec/multi_search_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe 'multi-search' do # rubocop:todo RSpec/DescribeClass +describe 'multi-search' do def reset_indexes [Book, Color, Product].each do |klass| klass.delete_all diff --git a/spec/support/active_record_classes.rb b/spec/support/active_record_classes.rb index 3b3cbfa6..fba0b1c2 100644 --- a/spec/support/active_record_classes.rb +++ b/spec/support/active_record_classes.rb @@ -79,4 +79,3 @@ class EncodedString < ActiveRecord::Base end end end - diff --git a/spec/support/active_record_schema.rb b/spec/support/active_record_schema.rb index fdcaa478..8673a122 100644 --- a/spec/support/active_record_schema.rb +++ b/spec/support/active_record_schema.rb @@ -24,5 +24,5 @@ end def ar_schema - @schema ||= ActiveRecord::Schema.new + @ar_schema ||= ActiveRecord::Schema.new end diff --git a/spec/support/models/animals.rb b/spec/support/models/animals.rb index 0e17351e..a177298e 100644 --- a/spec/support/models/animals.rb +++ b/spec/support/models/animals.rb @@ -31,4 +31,3 @@ def ms_id "dog_#{id}" end end - diff --git a/spec/support/models/book.rb b/spec/support/models/book.rb index bf5ccc24..5b92db30 100644 --- a/spec/support/models/book.rb +++ b/spec/support/models/book.rb @@ -32,4 +32,3 @@ def public? released && !premium end end - diff --git a/spec/support/models/color.rb b/spec/support/models/color.rb index 80b3ed1c..96807212 100644 --- a/spec/support/models/color.rb +++ b/spec/support/models/color.rb @@ -35,4 +35,3 @@ def will_save_change_to_short_name? false end end - diff --git a/spec/support/models/fruit.rb b/spec/support/models/fruit.rb index 7e99c94e..b07e8b8d 100644 --- a/spec/support/models/fruit.rb +++ b/spec/support/models/fruit.rb @@ -12,5 +12,3 @@ class Fruit < ActiveRecord::Base attribute :name end end - - diff --git a/spec/support/models/movie.rb b/spec/support/models/movie.rb index a533930f..5198a286 100644 --- a/spec/support/models/movie.rb +++ b/spec/support/models/movie.rb @@ -12,4 +12,3 @@ class Movie < ActiveRecord::Base typo_tolerance enabled: false end end - diff --git a/spec/support/models/people.rb b/spec/support/models/people.rb index 3e2cfc0a..7c7c18da 100644 --- a/spec/support/models/people.rb +++ b/spec/support/models/people.rb @@ -22,4 +22,3 @@ def will_save_change_to_full_name? will_save_change_to_first_name? || will_save_change_to_last_name? end end - diff --git a/spec/support/models/post.rb b/spec/support/models/post.rb index b3817575..f5b8cd1c 100644 --- a/spec/support/models/post.rb +++ b/spec/support/models/post.rb @@ -25,4 +25,3 @@ class Post < ActiveRecord::Base class Comment < ActiveRecord::Base end - diff --git a/spec/support/models/product.rb b/spec/support/models/product.rb index e2d98b58..227e8631 100644 --- a/spec/support/models/product.rb +++ b/spec/support/models/product.rb @@ -32,4 +32,3 @@ def published? class Camera < Product end - diff --git a/spec/support/models/queued_models.rb b/spec/support/models/queued_models.rb index 18371c59..129a7d0f 100644 --- a/spec/support/models/queued_models.rb +++ b/spec/support/models/queued_models.rb @@ -55,4 +55,3 @@ def should_index? is_public end end - diff --git a/spec/support/models/restaurant.rb b/spec/support/models/restaurant.rb index 17cbd64b..d39f4071 100644 --- a/spec/support/models/restaurant.rb +++ b/spec/support/models/restaurant.rb @@ -16,4 +16,3 @@ class Restaurant < ActiveRecord::Base pagination max_total_hits: 5 end end - diff --git a/spec/support/models/song.rb b/spec/support/models/song.rb index 2cfaed69..be164576 100644 --- a/spec/support/models/song.rb +++ b/spec/support/models/song.rb @@ -27,4 +27,3 @@ def public? released && !premium end end - diff --git a/spec/support/models/vegetable.rb b/spec/support/models/vegetable.rb index 2b5f27f7..62eca75b 100644 --- a/spec/support/models/vegetable.rb +++ b/spec/support/models/vegetable.rb @@ -11,4 +11,3 @@ class Vegetable < ActiveRecord::Base attribute :name end end - diff --git a/spec/support/sequel_db.rb b/spec/support/sequel_db.rb index faf0bae9..48ad3978 100644 --- a/spec/support/sequel_db.rb +++ b/spec/support/sequel_db.rb @@ -8,4 +8,3 @@ def sequel_db end FileUtils.rm('sequel_data.sqlite3') if File.exist?('sequel_data.sqlite3') - diff --git a/spec/support/sequel_models/book.rb b/spec/support/sequel_models/book.rb index 81f8218f..50a2f262 100644 --- a/spec/support/sequel_models/book.rb +++ b/spec/support/sequel_models/book.rb @@ -38,4 +38,3 @@ def public? released && !premium end end -