Merge pull request #2122 from projectblacklight/update-rubocop-rspec

Update rubocop-rspec

Author: mejackreed

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-01-18 23:13:39 -0600 using RuboCop version 0.63.0.
+# on 2019-08-05 11:45:43 -0500 using RuboCop version 0.63.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -36,7 +36,7 @@ Layout/ClosingParenthesisIndentation:
   Exclude:
     - 'app/views/catalog/index.atom.builder'
 
-# Offense count: 108
+# Offense count: 109
 # Cop supports --auto-correct.
 Layout/EmptyLineAfterMagicComment:
   Enabled: false
@@ -69,11 +69,10 @@ Layout/LeadingCommentSpace:
     - 'app/models/concerns/blacklight/document/export.rb'
     - 'app/views/catalog/_document.atom.builder'
 
-# Offense count: 2
+# Offense count: 1
 # Cop supports --auto-correct.
 Layout/MultilineBlockLayout:
   Exclude:
-    - 'lib/generators/blacklight/install_generator.rb'
     - 'lib/generators/blacklight/test_support_generator.rb'
 
 # Offense count: 2
@@ -127,13 +126,12 @@ Layout/SpaceInsideParens:
     - 'app/views/catalog/_document.rss.builder'
     - 'app/views/catalog/index.atom.builder'
 
-# Offense count: 13
+# Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: AllowInHeredoc.
 Layout/TrailingWhitespace:
   Exclude:
     - 'app/views/catalog/_document.rss.builder'
-    - 'app/views/catalog/index.atom.builder'
 
 # Offense count: 1
 Lint/AmbiguousBlockAssociation:
@@ -211,15 +209,15 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Max: 12
 
-# Offense count: 47
+# Offense count: 48
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
   Max: 35
 
 # Offense count: 8
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 215
+  Max: 210
 
 # Offense count: 1
 # Configuration parameters: CountKeywordArgs.
@@ -255,7 +253,7 @@ Naming/UncommunicativeMethodParamName:
     - 'spec/features/search_context_spec.rb'
     - 'spec/features/search_results_spec.rb'
 
-# Offense count: 15
+# Offense count: 16
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: snake_case, normalcase, non_integer
 Naming/VariableNumber:
@@ -332,7 +330,7 @@ RSpec/FilePath:
     - 'spec/presenters/pipeline_spec.rb'
     - 'spec/presenters/thumbnail_presenter_spec.rb'
 
-# Offense count: 194
+# Offense count: 197
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
   Enabled: false
@@ -344,6 +342,18 @@ RSpec/IteratedExpectation:
     - 'spec/models/blacklight/solr/response/group_spec.rb'
     - 'spec/models/blacklight/solr/response_spec.rb'
 
+# Offense count: 17
+RSpec/LeakyConstantDeclaration:
+  Exclude:
+    - 'spec/controllers/blacklight/search_fields_spec.rb'
+    - 'spec/controllers/bookmarks_controller_spec.rb'
+    - 'spec/controllers/catalog_controller_spec.rb'
+    - 'spec/models/blacklight/configurable_spec.rb'
+    - 'spec/models/blacklight/document/active_model_shim_spec.rb'
+    - 'spec/models/blacklight/document_spec.rb'
+    - 'spec/models/blacklight/solr/document_spec.rb'
+    - 'spec/presenters/blacklight/show_presenter_spec.rb'
+
 # Offense count: 8
 RSpec/MessageChain:
   Exclude:
@@ -371,12 +381,12 @@ RSpec/MessageSpies:
     - 'spec/presenters/blacklight/show_presenter_spec.rb'
     - 'spec/presenters/thumbnail_presenter_spec.rb'
 
-# Offense count: 345
+# Offense count: 346
 # Configuration parameters: AggregateFailuresByDefault.
 RSpec/MultipleExpectations:
   Max: 16
 
-# Offense count: 328
+# Offense count: 329
 # Configuration parameters: IgnoreSharedExamples.
 RSpec/NamedSubject:
   Enabled: false
@@ -406,13 +416,14 @@ RSpec/ScatteredLet:
     - 'spec/models/blacklight/solr/search_builder_spec.rb'
     - 'spec/views/catalog/index.atom.builder_spec.rb'
 
-# Offense count: 4
+# Offense count: 10
 RSpec/SubjectStub:
   Exclude:
     - 'spec/lib/blacklight/search_state_spec.rb'
+    - 'spec/models/blacklight/search_builder_spec.rb'
     - 'spec/services/blacklight/search_service_spec.rb'
 
-# Offense count: 118
+# Offense count: 119
 # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:
   Enabled: false
@@ -476,7 +487,7 @@ Style/BracesAroundHashParameters:
     - 'lib/blacklight/solr/response/facets.rb'
     - 'lib/generators/blacklight/test_support_generator.rb'
 
-# Offense count: 50
+# Offense count: 51
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, EnforcedStyle.
 # SupportedStyles: nested, compact
@@ -497,7 +508,7 @@ Style/ConditionalAssignment:
   Exclude:
     - 'lib/blacklight/solr/response/spelling.rb'
 
-# Offense count: 93
+# Offense count: 94
 Style/Documentation:
   Enabled: false
 

spec/models/blacklight/document/cache_key_spec.rb

@@ -5,7 +5,7 @@
   let(:subject) { SolrDocument.new(attributes) }
 
   it 'SolrDocument includes the module' do
-    expect(subject.class).to include(Blacklight::Document::CacheKey)
+    expect(subject.class).to include(described_class)
   end
 
   describe 'new record' do

spec/models/blacklight/solr/response/facets_spec.rb

@@ -3,7 +3,7 @@
 RSpec.describe Blacklight::Solr::Response::Facets, api: true do
   describe Blacklight::Solr::Response::Facets::FacetField do
     describe "A field with default options" do
-      subject { Blacklight::Solr::Response::Facets::FacetField.new "my_field", [] }
+      subject { described_class.new "my_field", [] }
 
       its(:name) { is_expected.to eq "my_field" }
       its(:limit) { is_expected.to eq 100 }
@@ -12,7 +12,7 @@
     end
 
     describe "A field with additional options" do
-      subject { Blacklight::Solr::Response::Facets::FacetField.new "my_field", [], limit: 15, sort: 'alpha', offset: 23 }
+      subject { described_class.new "my_field", [], limit: 15, sort: 'alpha', offset: 23 }
 
       its(:name) { is_expected.to eq "my_field" }
       its(:limit) { is_expected.to eq 15 }

spec/models/blacklight/solr/response_spec.rb

@@ -6,9 +6,9 @@
   let(:config) { Blacklight::Configuration.new }
 
   let(:r) do
-    Blacklight::Solr::Response.new(raw_response,
-                                   raw_response['params'],
-                                   blacklight_config: config)
+    described_class.new(raw_response,
+                        raw_response['params'],
+                        blacklight_config: config)
   end
 
   it 'creates a valid response' do
@@ -113,99 +113,99 @@
   it 'provides the responseHeader params' do
     raw_response = eval(mock_query_response)
     raw_response['responseHeader']['params']['test'] = :test
-    r = Blacklight::Solr::Response.new(raw_response, raw_response['params'])
+    r = described_class.new(raw_response, raw_response['params'])
     expect(r.params['test']).to eq :test
   end
 
   it 'provides the solr-returned params and "rows" should be 11' do
     raw_response = eval(mock_query_response)
-    r = Blacklight::Solr::Response.new(raw_response, {})
+    r = described_class.new(raw_response, {})
     expect(r.params[:rows].to_s).to eq '11'
     expect(r.params[:sort]).to eq 'title_si asc, pub_date_si desc'
   end
 
   it 'provides the ruby request params if responseHeader["params"] does not exist' do
     raw_response = eval(mock_query_response)
     raw_response.delete 'responseHeader'
-    r = Blacklight::Solr::Response.new(raw_response, rows: 999, sort: 'score desc, pub_date_si desc, title_si asc')
+    r = described_class.new(raw_response, rows: 999, sort: 'score desc, pub_date_si desc, title_si asc')
     expect(r.params[:rows].to_s).to eq '999'
     expect(r.params[:sort]).to eq 'score desc, pub_date_si desc, title_si asc'
   end
 
   it 'provides spelling suggestions for regular spellcheck results' do
     raw_response = eval(mock_response_with_spellcheck)
-    r = Blacklight::Solr::Response.new(raw_response, {})
+    r = described_class.new(raw_response, {})
     expect(r.spelling.words).to include("dell")
     expect(r.spelling.words).to include("ultrasharp")
   end
 
   it 'provides spelling suggestions for extended spellcheck results' do
     raw_response = eval(mock_response_with_spellcheck_extended)
-    r = Blacklight::Solr::Response.new(raw_response, {})
+    r = described_class.new(raw_response, {})
     expect(r.spelling.words).to include("dell")
     expect(r.spelling.words).to include("ultrasharp")
   end
 
   it 'provides no spelling suggestions when extended results and suggestion frequency is the same as original query frequency' do
     raw_response = eval(mock_response_with_spellcheck_same_frequency)
-    r = Blacklight::Solr::Response.new(raw_response, {})
+    r = described_class.new(raw_response, {})
     expect(r.spelling.words).to eq []
   end
 
   context "pre solr 5 spellcheck collation syntax" do
     it 'provides spelling suggestions for a regular spellcheck results with a collation' do
       raw_response = eval(mock_response_with_spellcheck_collation)
-      r = Blacklight::Solr::Response.new(raw_response, {})
+      r = described_class.new(raw_response, {})
       expect(r.spelling.words).to include("dell")
       expect(r.spelling.words).to include("ultrasharp")
     end
 
     it 'provides spelling suggestion collation' do
       raw_response = eval(mock_response_with_spellcheck_collation)
-      r = Blacklight::Solr::Response.new(raw_response, {})
+      r = described_class.new(raw_response, {})
       expect(r.spelling.collation).to eq 'dell ultrasharp'
     end
   end
 
   context "solr 5 spellcheck collation syntax" do
     it 'provides spelling suggestions for a regular spellcheck results with a collation' do
       raw_response = eval(mock_response_with_spellcheck_collation_solr5)
-      r = Blacklight::Solr::Response.new(raw_response, {})
+      r = described_class.new(raw_response, {})
       expect(r.spelling.words).to include("dell")
       expect(r.spelling.words).to include("ultrasharp")
     end
 
     it 'provides spelling suggestion collation' do
       raw_response = eval(mock_response_with_spellcheck_collation_solr5)
-      r = Blacklight::Solr::Response.new(raw_response, {})
+      r = described_class.new(raw_response, {})
       expect(r.spelling.collation).to eq 'dell ultrasharp'
     end
   end
 
   context 'solr 6.5 spellcheck collation syntax' do
     it 'provides spelling suggestions for a regular spellcheck results with a collation' do
       raw_response = eval(mock_response_with_spellcheck_collation_solr65)
-      r = Blacklight::Solr::Response.new(raw_response, {})
+      r = described_class.new(raw_response, {})
       expect(r.spelling.words).to include("dell")
       expect(r.spelling.words).to include("ultrasharp")
     end
   end
 
   it "provides MoreLikeThis suggestions" do
     raw_response = eval(mock_response_with_more_like_this)
-    r = Blacklight::Solr::Response.new(raw_response, {})
+    r = described_class.new(raw_response, {})
     expect(r.more_like(double(id: '79930185'))).to have(2).items
   end
 
   it "is empty when the response has no results" do
-    r = Blacklight::Solr::Response.new({}, {})
+    r = described_class.new({}, {})
     allow(r).to receive_messages(total: 0)
     expect(r).to be_empty
   end
 
   describe "#export_formats" do
     it "collects the unique export formats for the current response" do
-      r = Blacklight::Solr::Response.new({}, {})
+      r = described_class.new({}, {})
       allow(r).to receive_messages(documents: [double(export_formats: { a: 1, b: 2 }), double(export_formats: { b: 1, c: 2 })])
       expect(r.export_formats).to include :a, :b
     end

spec/models/blacklight/suggest/response_spec.rb

@@ -43,7 +43,7 @@
 
   describe '#initialize' do
     it 'creates a Blacklight::Suggest::Response' do
-      expect(empty_response).to be_an Blacklight::Suggest::Response
+      expect(empty_response).to be_an described_class
     end
   end
 

spec/models/solr_document_spec.rb

@@ -3,7 +3,7 @@
 RSpec.describe SolrDocument, api: true do
   describe "access methods" do
     let(:solrdoc) do
-      SolrDocument.new(id: '00282214', format: ['Book'], title_tsim: 'some-title')
+      described_class.new(id: '00282214', format: ['Book'], title_tsim: 'some-title')
     end
 
     describe "#[]" do