Clean up RSpec/MessageSpies rubocop violations

.github/workflows/linting.yml

@@ -115,11 +115,13 @@ jobs:
     - name: Run RuboCop against todo file
       continue-on-error: true
       run: |
-        bundle exec rubocop --auto-gen-config --no-exclude-limit --no-offense-counts --no-auto-gen-timestamp
+        cmd="bundle exec rubocop --auto-gen-config --exclude-limit=5 --no-offense-counts --no-auto-gen-timestamp"
+        ${cmd:?}
+        set +e
         if [ -n "$(git status --porcelain)" ]
         then
           git status --porcelain
           git diff -u .
-           >&2 echo "Please fix deltas if bad or run 'bundle exec rubocop --auto-gen-config --no-exclude-limit --no-offense-counts --no-auto-gen-timestamp' and push up changes if good"
+           >&2 echo "Please address any new issues, then run '${cmd:?}' and push up any improvements"
            exit 1
         fi

.rubocop.yml

@@ -37,7 +37,6 @@ Metrics/ParameterLists:
   Max: 7
   CountKeywordArgs: false
 
-
 # we tend to use @@ and the risk doesn't seem high
 Style/ClassVars:
   Enabled: false

lib/solargraph/api_map.rb

@@ -728,7 +728,6 @@ def store
     # @param skip [Set<String>]
     # @param no_core [Boolean] Skip core classes if true
     # @return [Array<Pin::Base>]
-    # rubocop:disable Metrics/CyclomaticComplexity
     def inner_get_methods rooted_tag, scope, visibility, deep, skip, no_core = false
       rooted_type = ComplexType.parse(rooted_tag).force_rooted
       fqns = rooted_type.namespace
@@ -802,7 +801,6 @@ def inner_get_methods rooted_tag, scope, visibility, deep, skip, no_core = false
       end
       result
     end
-    # rubocop:enable Metrics/CyclomaticComplexity
 
     # @return [Hash]
     def path_macros

solargraph.gemspec

@@ -51,9 +51,16 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'public_suffix', '~> 3.1'
   s.add_development_dependency 'rake', '~> 13.2'
   s.add_development_dependency 'rspec', '~> 3.5'
-  s.add_development_dependency 'rubocop-rake', '~> 0.7'
-  s.add_development_dependency 'rubocop-rspec', '~> 3.6'
-  s.add_development_dependency 'rubocop-yard', '~> 1.0'
+  #
+  # very specific development-time RuboCop version patterns for CI
+  # stability - feel free to update in an isolated PR
+  #
+  # even more specific on RuboCop itself, which is written into _todo
+  # file.
+  s.add_development_dependency 'rubocop', '~> 1.80.0.0'
+  s.add_development_dependency 'rubocop-rake', '~> 0.7.1'
+  s.add_development_dependency 'rubocop-rspec', '~> 3.6.0'
+  s.add_development_dependency 'rubocop-yard', '~> 1.0.0'
   s.add_development_dependency 'simplecov', '~> 0.21'
   s.add_development_dependency 'simplecov-lcov', '~> 0.8'
   s.add_development_dependency 'undercover', '~> 0.7'

spec/api_map_spec.rb

@@ -1,7 +1,6 @@
 require 'tmpdir'
 
 describe Solargraph::ApiMap do
-  # rubocop:disable RSpec/InstanceVariable
   before :all do
     @api_map = Solargraph::ApiMap.new
   end
@@ -878,6 +877,4 @@ def c
     clip = api_map.clip_at('test.rb', [18, 4])
     expect(clip.infer.to_s).to eq('Integer')
   end
-
-  # rubocop:enable RSpec/InstanceVariable
 end

spec/convention_spec.rb

@@ -1,5 +1,4 @@
 describe Solargraph::Convention do
-  # rubocop:disable RSpec/ExampleLength, RSpec/MultipleExpectations
   it 'newly defined pins are resolved by ApiMap after file changes' do
     filename = 'test.rb'
 
@@ -106,5 +105,4 @@ def local _source_map
 
     described_class.unregister updated_dummy_convention
   end
-  # rubocop:enable RSpec/ExampleLength, RSpec/MultipleExpectations
 end

spec/doc_map_spec.rb

@@ -42,8 +42,9 @@
   it 'does not warn for redundant requires' do
     # Requiring 'set' is unnecessary because it's already included in core. It
     # might make sense to log redundant requires, but a warning is overkill.
-    expect(Solargraph.logger).not_to receive(:warn).with(/path set/)
+    allow(Solargraph.logger).to receive(:warn)
     Solargraph::DocMap.new(['set'], [])
+    expect(Solargraph.logger).not_to have_received(:warn).with(/path set/)
   end
 
   it 'ignores nil requires' do

spec/language_server/host/diagnoser_spec.rb

@@ -1,9 +1,10 @@
 describe Solargraph::LanguageServer::Host::Diagnoser do
   it "diagnoses on ticks" do
     host = double(Solargraph::LanguageServer::Host, options: { 'diagnostics' => true }, synchronizing?: false)
+    allow(host).to receive(:diagnose)
     diagnoser = Solargraph::LanguageServer::Host::Diagnoser.new(host)
     diagnoser.schedule 'file.rb'
-    expect(host).to receive(:diagnose).with('file.rb')
     diagnoser.tick
+    expect(host).to have_received(:diagnose).with('file.rb')
   end
 end

spec/language_server/host/message_worker_spec.rb

@@ -2,11 +2,12 @@
   it "handle requests on queue" do
     host = double(Solargraph::LanguageServer::Host)
     message = {'method' => '$/example'}
-    expect(host).to receive(:receive).with(message).and_return(nil)
+    allow(host).to receive(:receive).with(message).and_return(nil)
 
     worker = Solargraph::LanguageServer::Host::MessageWorker.new(host)
     worker.queue(message)
     expect(worker.messages).to eq [message]
     worker.tick
+    expect(host).to have_received(:receive).with(message)
   end
 end