Merge pull request #2533 from joshcooper/rspec-mocks

(maint) Expect `with` hash arguments instead of kwargs

Author: tvpartytonight

spec/custom_facts/core/execution_spec.rb

@@ -37,7 +37,7 @@
   end
 
   it 'delegates #exec to #execute' do
-    expect(impl).to receive(:execute).with('waffles', on_fail: nil)
+    expect(impl).to receive(:execute).with('waffles', { on_fail: nil })
     execution.exec('waffles')
   end
 

spec/custom_facts/util/collection_spec.rb

@@ -41,9 +41,9 @@
 
     it 'passes resolution specific options to the fact' do
       fact = Facter::Util::Fact.new(:myname)
-      allow(Facter::Util::Fact).to receive(:new).with(:myname, timeout: 'myval').and_return(fact)
+      allow(Facter::Util::Fact).to receive(:new).with(:myname, { timeout: 'myval' }).and_return(fact)
 
-      expect(fact).to receive(:add).with(timeout: 'myval')
+      expect(fact).to receive(:add).with({ timeout: 'myval' })
 
       collection.add(:myname, timeout: 'myval') {}
     end

spec/facter/facts/alpine/os/release_spec.rb

@@ -6,7 +6,7 @@
 
     before do
       allow(Facter::Resolvers::SpecificReleaseFile).to receive(:resolve)
-        .with(:release, release_file: '/etc/alpine-release')
+        .with(:release, { release_file: '/etc/alpine-release' })
         .and_return(value)
     end
 
@@ -17,7 +17,7 @@
       it 'calls Facter::Resolvers::SpecificReleaseFile with version' do
         fact.call_the_resolver
         expect(Facter::Resolvers::SpecificReleaseFile).to have_received(:resolve)
-          .with(:release, release_file: '/etc/alpine-release')
+          .with(:release, { release_file: '/etc/alpine-release' })
       end
 
       it 'returns operating system name fact' do

spec/facter/facts/amzn/os/distro/codename_spec.rb

@@ -4,19 +4,19 @@
   describe '#call_the_resolver' do
     subject(:fact) { Facts::Amzn::Os::Distro::Codename.new }
 
+    before do
+      allow(Facter::Resolvers::SpecificReleaseFile).to receive(:resolve)
+        .with(:release, { release_file: '/etc/system-release' }).and_return(value)
+    end
+
     context 'when codename is not in system-release' do
       let(:value) { 'Amazon Linux AMI release 2017.03' }
       let(:expected_value) { 'n/a' }
 
-      before do
-        allow(Facter::Resolvers::SpecificReleaseFile).to receive(:resolve)
-          .with(:release, release_file: '/etc/system-release').and_return(value)
-      end
-
       it 'calls Facter::Resolvers::SpecificReleaseFile' do
         fact.call_the_resolver
         expect(Facter::Resolvers::SpecificReleaseFile).to have_received(:resolve)
-          .with(:release, release_file: '/etc/system-release')
+          .with(:release, { release_file: '/etc/system-release' })
       end
 
       it "returns 'n/a' fact value" do
@@ -29,15 +29,10 @@
       let(:value) { 'Amazon Linux release 2 (2017.12) LTS Release Candidate' }
       let(:expected_value) { '2017.12' }
 
-      before do
-        allow(Facter::Resolvers::SpecificReleaseFile).to receive(:resolve)
-          .with(:release, release_file: '/etc/system-release').and_return(value)
-      end
-
       it 'calls Facter::Resolvers::SpecificReleaseFile' do
         fact.call_the_resolver
         expect(Facter::Resolvers::SpecificReleaseFile).to have_received(:resolve)
-          .with(:release, release_file: '/etc/system-release')
+          .with(:release, { release_file: '/etc/system-release' })
       end
 
       it 'returns release fact' do

spec/facter/facts/amzn/os/distro/description_spec.rb

@@ -8,13 +8,13 @@
 
     before do
       allow(Facter::Resolvers::SpecificReleaseFile).to receive(:resolve)
-        .with(:release, release_file: '/etc/system-release').and_return(value)
+        .with(:release, { release_file: '/etc/system-release' }).and_return(value)
     end
 
     it 'calls Facter::Resolvers::SpecificReleaseFile' do
       fact.call_the_resolver
       expect(Facter::Resolvers::SpecificReleaseFile).to have_received(:resolve)
-        .with(:release, release_file: '/etc/system-release')
+        .with(:release, { release_file: '/etc/system-release' })
     end
 
     it 'returns release fact' do

spec/facter/facts/amzn/os/distro/id_spec.rb

@@ -9,7 +9,7 @@
 
     before do
       allow(Facter::Resolvers::SpecificReleaseFile).to receive(:resolve)
-        .with(:release, release_file: '/etc/system-release').and_return(value)
+        .with(:release, { release_file: '/etc/system-release' }).and_return(value)
     end
 
     it 'calls Facter::Resolvers::SpecificReleaseFile' do

spec/facter/facts/amzn/os/distro/release_spec.rb

@@ -6,7 +6,7 @@
 
     before do
       allow(Facter::Resolvers::ReleaseFromFirstLine).to receive(:resolve)
-        .with(:release, release_file: '/etc/system-release')
+        .with(:release, { release_file: '/etc/system-release' })
         .and_return(value)
     end
 

spec/facter/facts/amzn/os/release_spec.rb

@@ -6,7 +6,7 @@
 
     before do
       allow(Facter::Resolvers::ReleaseFromFirstLine).to receive(:resolve)
-        .with(:release, release_file: '/etc/system-release')
+        .with(:release, { release_file: '/etc/system-release' })
         .and_return(value)
     end
 

spec/facter/facts/devuan/os/release_spec.rb

@@ -6,7 +6,7 @@
 
     before do
       allow(Facter::Resolvers::SpecificReleaseFile).to receive(:resolve)
-        .with(:release, release_file: '/etc/devuan_version')
+        .with(:release, { release_file: '/etc/devuan_version' })
         .and_return(value)
     end
 

spec/facter/facts/gentoo/os/release_spec.rb

@@ -6,7 +6,7 @@
 
     before do
       allow(Facter::Resolvers::ReleaseFromFirstLine).to receive(:resolve)
-        .with(:release, release_file: '/etc/gentoo-release')
+        .with(:release, { release_file: '/etc/gentoo-release' })
         .and_return(value)
     end