Skip to content

Commit c35f280

Browse files
committed
(maint) Expect with hash arguments instead of kwargs
Facter verifies partial doubles so arguments are checked against the original method and to ensure methods that don't exist can't be stubbed. RSpec 3.11.2 changes how keyword arguments are verified[1]. So previously you could write `expect(:m).with(a: true)` and it would pass if the method was called with a hash or keyword arguments. But now the expectation must expect a hash, not keyword arguments. [1] rspec/rspec-mocks@bc1a687
1 parent d84fea9 commit c35f280

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+149
-132
lines changed

spec/custom_facts/core/execution_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
end
3838

3939
it 'delegates #exec to #execute' do
40-
expect(impl).to receive(:execute).with('waffles', on_fail: nil)
40+
expect(impl).to receive(:execute).with('waffles', { on_fail: nil })
4141
execution.exec('waffles')
4242
end
4343

spec/custom_facts/util/collection_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141

4242
it 'passes resolution specific options to the fact' do
4343
fact = Facter::Util::Fact.new(:myname)
44-
allow(Facter::Util::Fact).to receive(:new).with(:myname, timeout: 'myval').and_return(fact)
44+
allow(Facter::Util::Fact).to receive(:new).with(:myname, { timeout: 'myval' }).and_return(fact)
4545

46-
expect(fact).to receive(:add).with(timeout: 'myval')
46+
expect(fact).to receive(:add).with({ timeout: 'myval' })
4747

4848
collection.add(:myname, timeout: 'myval') {}
4949
end

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
before do
88
allow(Facter::Resolvers::SpecificReleaseFile).to receive(:resolve)
9-
.with(:release, release_file: '/etc/alpine-release')
9+
.with(:release, { release_file: '/etc/alpine-release' })
1010
.and_return(value)
1111
end
1212

@@ -17,7 +17,7 @@
1717
it 'calls Facter::Resolvers::SpecificReleaseFile with version' do
1818
fact.call_the_resolver
1919
expect(Facter::Resolvers::SpecificReleaseFile).to have_received(:resolve)
20-
.with(:release, release_file: '/etc/alpine-release')
20+
.with(:release, { release_file: '/etc/alpine-release' })
2121
end
2222

2323
it 'returns operating system name fact' do

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

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44
describe '#call_the_resolver' do
55
subject(:fact) { Facts::Amzn::Os::Distro::Codename.new }
66

7+
before do
8+
allow(Facter::Resolvers::SpecificReleaseFile).to receive(:resolve)
9+
.with(:release, { release_file: '/etc/system-release' }).and_return(value)
10+
end
11+
712
context 'when codename is not in system-release' do
813
let(:value) { 'Amazon Linux AMI release 2017.03' }
914
let(:expected_value) { 'n/a' }
1015

11-
before do
12-
allow(Facter::Resolvers::SpecificReleaseFile).to receive(:resolve)
13-
.with(:release, release_file: '/etc/system-release').and_return(value)
14-
end
15-
1616
it 'calls Facter::Resolvers::SpecificReleaseFile' do
1717
fact.call_the_resolver
1818
expect(Facter::Resolvers::SpecificReleaseFile).to have_received(:resolve)
19-
.with(:release, release_file: '/etc/system-release')
19+
.with(:release, { release_file: '/etc/system-release' })
2020
end
2121

2222
it "returns 'n/a' fact value" do
@@ -29,15 +29,10 @@
2929
let(:value) { 'Amazon Linux release 2 (2017.12) LTS Release Candidate' }
3030
let(:expected_value) { '2017.12' }
3131

32-
before do
33-
allow(Facter::Resolvers::SpecificReleaseFile).to receive(:resolve)
34-
.with(:release, release_file: '/etc/system-release').and_return(value)
35-
end
36-
3732
it 'calls Facter::Resolvers::SpecificReleaseFile' do
3833
fact.call_the_resolver
3934
expect(Facter::Resolvers::SpecificReleaseFile).to have_received(:resolve)
40-
.with(:release, release_file: '/etc/system-release')
35+
.with(:release, { release_file: '/etc/system-release' })
4136
end
4237

4338
it 'returns release fact' do

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88

99
before do
1010
allow(Facter::Resolvers::SpecificReleaseFile).to receive(:resolve)
11-
.with(:release, release_file: '/etc/system-release').and_return(value)
11+
.with(:release, { release_file: '/etc/system-release' }).and_return(value)
1212
end
1313

1414
it 'calls Facter::Resolvers::SpecificReleaseFile' do
1515
fact.call_the_resolver
1616
expect(Facter::Resolvers::SpecificReleaseFile).to have_received(:resolve)
17-
.with(:release, release_file: '/etc/system-release')
17+
.with(:release, { release_file: '/etc/system-release' })
1818
end
1919

2020
it 'returns release fact' do

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
before do
1111
allow(Facter::Resolvers::SpecificReleaseFile).to receive(:resolve)
12-
.with(:release, release_file: '/etc/system-release').and_return(value)
12+
.with(:release, { release_file: '/etc/system-release' }).and_return(value)
1313
end
1414

1515
it 'calls Facter::Resolvers::SpecificReleaseFile' do

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
before do
88
allow(Facter::Resolvers::ReleaseFromFirstLine).to receive(:resolve)
9-
.with(:release, release_file: '/etc/system-release')
9+
.with(:release, { release_file: '/etc/system-release' })
1010
.and_return(value)
1111
end
1212

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
before do
88
allow(Facter::Resolvers::ReleaseFromFirstLine).to receive(:resolve)
9-
.with(:release, release_file: '/etc/system-release')
9+
.with(:release, { release_file: '/etc/system-release' })
1010
.and_return(value)
1111
end
1212

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
before do
88
allow(Facter::Resolvers::SpecificReleaseFile).to receive(:resolve)
9-
.with(:release, release_file: '/etc/devuan_version')
9+
.with(:release, { release_file: '/etc/devuan_version' })
1010
.and_return(value)
1111
end
1212

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
before do
88
allow(Facter::Resolvers::ReleaseFromFirstLine).to receive(:resolve)
9-
.with(:release, release_file: '/etc/gentoo-release')
9+
.with(:release, { release_file: '/etc/gentoo-release' })
1010
.and_return(value)
1111
end
1212

0 commit comments

Comments
 (0)