Merge pull request #556 from voxpupuli/plumbing/issues/78

refactor: change from mocha to rspec-mocks

Author: kenyon

.sync.yml

@@ -4,7 +4,5 @@ Gemfile:
     ':test':
       - gem: 'redis'
       - gem: 'mock_redis'
-      - gem: 'mocha'
 spec/spec_helper.rb:
-  mock_with: ":mocha"
   facterdb_string_keys: true

Gemfile

@@ -8,7 +8,6 @@ group :test do
   gem 'puppet_metadata', '~> 5.0',  :require => false
   gem 'redis',                      :require => false
   gem 'mock_redis',                 :require => false
-  gem 'mocha',                      :require => false
 end
 
 group :development do

spec/functions/redis/get_spec.rb

@@ -28,7 +28,7 @@
   context 'should return nil if key does not exist and no default is specified' do
     before do
       mr = MockRedis.new
-      Redis.stubs(:new).returns(mr)
+      allow(Redis).to receive(:new).and_return(mr)
     end
 
     it { is_expected.to run.with_params('nonexistent_key', REDIS_URL).and_return(nil) }
@@ -37,7 +37,7 @@
   context 'should return the default value if specified and key does not exist' do
     before do
       mr = MockRedis.new
-      Redis.stubs(:new).returns(mr)
+      allow(Redis).to receive(:new).and_return(mr)
     end
 
     it { is_expected.to run.with_params('nonexistent_key', REDIS_URL, 'default_value').and_return('default_value') }
@@ -46,7 +46,7 @@
   context 'should return the value of the specified key' do
     before do
       mr = MockRedis.new
-      Redis.stubs(:new).returns(mr)
+      allow(Redis).to receive(:new).and_return(mr)
       mr.set('key', 'value')
     end
 
@@ -56,7 +56,7 @@
   context 'should return the value of the specified key and not the default' do
     before do
       mr = MockRedis.new
-      Redis.stubs(:new).returns(mr)
+      allow(Redis).to receive(:new).and_return(mr)
       mr.set('key', 'value')
     end
 
@@ -80,7 +80,7 @@
   describe 'when an invalid type (non-string) is specified' do
     before do
       mr = MockRedis.new
-      Redis.stubs(:new).returns(mr)
+      allow(Redis).to receive(:new).and_return(mr)
     end
 
     [{ 'ha' => 'sh' }, true, 1, %w[an array]].each do |p|

spec/spec_helper.rb

@@ -11,7 +11,6 @@
 
 RSpec.configure do |c|
   c.facterdb_string_keys = true
-  c.mock_with :mocha
 end
 
 add_mocked_facts!

spec/unit/redis_server_version_spec.rb

@@ -8,14 +8,14 @@
   after { Facter.clear }
 
   it 'is 3.2.9 according to output' do
-    Facter::Util::Resolution.stubs(:which).with('redis-server').returns('/usr/bin/redis-server')
+    allow(Facter::Util::Resolution).to receive(:which).with('redis-server').and_return('/usr/bin/redis-server')
     redis_server_3209_version = "Redis server v=3.2.9 sha=00000000:0 malloc=jemalloc-4.0.3 bits=64 build=67e0f9d6580364c0\n"
-    Facter::Util::Resolution.stubs(:exec).with('redis-server -v').returns(redis_server_3209_version)
+    allow(Facter::Util::Resolution).to receive(:exec).with('redis-server -v').and_return(redis_server_3209_version)
     expect(Facter.fact(:redis_server_version).value).to eq('3.2.9')
   end
 
   it 'is empty string if redis-server not installed' do
-    Facter::Util::Resolution.stubs(:which).with('redis-server').returns(nil)
+    allow(Facter::Util::Resolution).to receive(:which).with('redis-server').and_return(nil)
     expect(Facter.fact(:redis_server_version).value).to eq(nil)
   end
 end