Skip to content

Commit 40be873

Browse files
committed
refactor: change from mocha to rspec-mocks
Ref: voxpupuli/plumbing#78
1 parent 6105fef commit 40be873

File tree

4 files changed

+8
-16
lines changed

4 files changed

+8
-16
lines changed

.sync.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
11
---
2-
spec/spec_helper.rb:
3-
mock_with: ':mocha'
42
spec/spec_helper_acceptance.rb:
53
unmanaged: false
6-
Gemfile:
7-
optional:
8-
':test':
9-
- gem: 'mocha'

Gemfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org'
66
group :test do
77
gem 'voxpupuli-test', '~> 11.0', :require => false
88
gem 'puppet_metadata', '~> 5.0', :require => false
9-
gem 'mocha', :require => false
109
end
1110

1211
group :development do

spec/spec_helper.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
RSpec.configure do |c|
1313
c.facterdb_string_keys = false
14-
c.mock_with :mocha
1514
end
1615

1716
add_mocked_facts!

spec/unit/facter/cvmfspartsize_spec.rb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
describe 'cvmfspartsize' do
66
before do
77
Facter.clear
8-
Facter::Util::Resolution.stubs(:which).with('df').returns('/usr/bin/df')
9-
File.stubs(:exist?).with('/etc/cvmfs/cvmfsfacts.yaml').returns(true)
10-
File.stubs(:open).with('/etc/cvmfs/cvmfsfacts.yaml').returns("---\ncvmfs_cache_base: /foo/bar\n")
11-
Facter::Core::Execution.stubs(:execute).with('/usr/bin/df -m -P /foo/bar').returns(cvmfs_df_result)
8+
allow(Facter::Util::Resolution).to receive(:which).with('df').and_return('/usr/bin/df')
9+
allow(File).to receive(:exist?).with('/etc/cvmfs/cvmfsfacts.yaml').and_return(true)
10+
allow(File).to receive(:open).with('/etc/cvmfs/cvmfsfacts.yaml').and_return("---\ncvmfs_cache_base: /foo/bar\n")
11+
allow(Facter::Core::Execution).to receive(:execute).with('/usr/bin/df -m -P /foo/bar').and_return(cvmfs_df_result)
1212
end
1313

1414
context 'working case' do
1515
before do
16-
File.stubs(:exist?).with('/foo/bar').returns(true)
16+
allow(File).to receive(:exist?).with('/foo/bar').and_return(true)
1717
end
1818

1919
let(:cvmfs_df_result) { "/dev/nvme0n1p5 976 251 659 28% /foo/bar\n" }
@@ -27,20 +27,20 @@
2727
let(:cvmfs_df_result) { :failed }
2828

2929
it 'does not return a fact' do
30-
File.stubs(:exist?).with('/etc/cvmfs/cvmfsfacts.yaml').returns(false)
30+
allow(File).to receive(:exist?).with('/etc/cvmfs/cvmfsfacts.yaml').and_return(false)
3131
expect(Facter.fact('cvmfspartsize').value).to be_nil
3232
end
3333
end
3434

3535
context 'df fails' do
3636
before do
37-
File.stubs(:exist?).with('/foo/bar').returns(false)
37+
allow(File).to receive(:exist?).with('/foo/bar').and_return(false)
3838
end
3939

4040
let(:cvmfs_df_result) { :failed }
4141

4242
it 'does not return a fact' do
43-
Facter::Core::Execution.stubs(:execute).with('/usr/bin/df -m -P /foo/bar').returns(:failed)
43+
allow(Facter::Core::Execution).to receive(:execute).with('/usr/bin/df -m -P /foo/bar').and_return(:failed)
4444
expect(Facter.fact('cvmfspartsize').value).to be_nil
4545
end
4646
end

0 commit comments

Comments
 (0)