Fix unit test stubs

Author: hunner

spec/unit/puppet/provider/mysql_database/mysql_spec.rb

@@ -30,17 +30,17 @@
     Facter.stubs(:value).with(:root_home).returns('/root')
     Puppet::Util.stubs(:which).with('mysql').returns('/usr/bin/mysql')
     File.stubs(:file?).with('/root/.my.cnf').returns(true)
-    provider.class.stubs(:mysql).with('show databases', 'regular').returns('new_database')
-    provider.class.stubs(:mysql).with(["show variables like '%_database'", 'new_database'], 'regular').returns("character_set_database latin1\ncollation_database latin1_swedish_ci\nskip_show_database OFF") # rubocop:disable Metrics/LineLength
+    provider.class.stubs(:mysql_caller).with('show databases', 'regular').returns('new_database')
+    provider.class.stubs(:mysql_caller).with(["show variables like '%_database'", 'new_database'], 'regular').returns("character_set_database latin1\ncollation_database latin1_swedish_ci\nskip_show_database OFF") # rubocop:disable Metrics/LineLength
   end
 
   let(:instance) { provider.class.instances.first }
 
   describe 'self.instances' do
     it 'returns an array of databases' do
-      provider.class.stubs(:mysql).with('show databases', 'regular').returns(raw_databases)
+      provider.class.stubs(:mysql_caller).with('show databases', 'regular').returns(raw_databases)
       raw_databases.each_line do |db|
-        provider.class.stubs(:mysql).with(["show variables like '%_database'", db.chomp], 'regular').returns("character_set_database latin1\ncollation_database  latin1_swedish_ci\nskip_show_database  OFF") # rubocop:disable Metrics/LineLength
+        provider.class.stubs(:mysql_caller).with(["show variables like '%_database'", db.chomp], 'regular').returns("character_set_database latin1\ncollation_database  latin1_swedish_ci\nskip_show_database  OFF") # rubocop:disable Metrics/LineLength
       end
       databases = provider.class.instances.map { |x| x.name }
       expect(parsed_databases).to match_array(databases)
@@ -56,15 +56,15 @@
 
   describe 'create' do
     it 'makes a database' do
-      provider.expects(:mysql).with("create database if not exists `#{resource[:name]}` character set `#{resource[:charset]}` collate `#{resource[:collate]}`", 'regular')
+      provider.class.expects(:mysql_caller).with("create database if not exists `#{resource[:name]}` character set `#{resource[:charset]}` collate `#{resource[:collate]}`", 'regular')
       provider.expects(:exists?).returns(true)
       expect(provider.create).to be_truthy
     end
   end
 
   describe 'destroy' do
     it 'removes a database if present' do
-      provider.expects(:mysql).with("drop database if exists `#{resource[:name]}`", 'regular')
+      provider.class.expects(:mysql_caller).with("drop database if exists `#{resource[:name]}`", 'regular')
       provider.expects(:exists?).returns(false)
       expect(provider.destroy).to be_truthy
     end
@@ -95,7 +95,7 @@
 
   describe 'charset=' do
     it 'changes the charset' do
-      provider.expects(:mysql).with("alter database `#{resource[:name]}` CHARACTER SET blah", 'regular').returns('0')
+      provider.class.expects(:mysql_caller).with("alter database `#{resource[:name]}` CHARACTER SET blah", 'regular').returns('0')
 
       provider.charset = 'blah'
     end
@@ -109,7 +109,7 @@
 
   describe 'collate=' do
     it 'changes the collate' do
-      provider.expects(:mysql).with("alter database `#{resource[:name]}` COLLATE blah", 'regular').returns('0')
+      provider.class.expects(:mysql_caller).with("alter database `#{resource[:name]}` COLLATE blah", 'regular').returns('0')
 
       provider.collate = 'blah'
     end

spec/unit/puppet/provider/mysql_plugin/mysql_spec.rb

@@ -17,7 +17,7 @@
     Facter.stubs(:value).with(:root_home).returns('/root')
     Puppet::Util.stubs(:which).with('mysql').returns('/usr/bin/mysql')
     File.stubs(:file?).with('/root/.my.cnf').returns(true)
-    provider.class.stubs(:mysql).with('show plugins', 'regular').returns('auth_socket	ACTIVE	AUTHENTICATION	auth_socket.so	GPL')
+    provider.class.stubs(:mysql_caller).with('show plugins', 'regular').returns('auth_socket	ACTIVE	AUTHENTICATION	auth_socket.so	GPL')
   end
 
   let(:instance) { provider.class.instances.first }
@@ -31,15 +31,15 @@
 
   describe 'create' do
     it 'loads a plugin' do
-      provider.expects(:mysql).with("install plugin #{resource[:name]} soname '#{resource[:soname]}'", 'regular')
+      provider.class.expects(:mysql_caller).with("install plugin #{resource[:name]} soname '#{resource[:soname]}'", 'regular')
       provider.expects(:exists?).returns(true)
       expect(provider.create).to be_truthy
     end
   end
 
   describe 'destroy' do
     it 'unloads a plugin if present' do
-      provider.expects(:mysql).with("uninstall plugin #{resource[:name]}", 'regular')
+      provider.class.expects(:mysql_caller).with("uninstall plugin #{resource[:name]}", 'regular')
       provider.expects(:exists?).returns(false)
       expect(provider.destroy).to be_truthy
     end