Merge branch 'i18nTesting' of github.com:puppetlabs/puppetlabs-mysql into i18nTesting

Author: Helen Campbell

lib/puppet/provider/mysql_datadir/mysql.rb

@@ -34,9 +34,7 @@ def create
 
     opts = [defaults_extra_file]
     %w[basedir datadir user].each do |opt|
-      # rubocop:disable Security/Eval
-      val = eval(opt)
-      # rubocop:enable Security/Eval
+      val = eval(opt) # rubocop:disable Security/Eval
       opts << "--#{opt}=#{val}" unless val.nil?
     end
 
@@ -57,9 +55,7 @@ def create
   end
 
   def destroy
-    # rubocop:disable Lint/UselessAssignment
-    name = @resource[:name]
-    # rubocop:enable Lint/UselessAssignment
+    name = @resource[:name] # rubocop:disable Lint/UselessAssignment
     raise ArgumentError, 'ERROR: Resource can not be removed'
   end
 

lib/puppet/provider/mysql_plugin/mysql.rb

@@ -18,11 +18,9 @@ def self.instances
   def self.prefetch(resources)
     plugins = instances
     resources.keys.each do |plugin|
-      # rubocop:disable Lint/AssignmentInCondition
-      if provider = plugins.find { |pl| pl.name == plugin }
+      if provider = plugins.find { |pl| pl.name == plugin } # rubocop:disable Lint/AssignmentInCondition
         resources[plugin].provider = provider
       end
-      # rubocop:enable Lint/AssignmentInCondition
     end
   end
 

spec/classes/graceful_failures_spec.rb

@@ -4,11 +4,10 @@
   context "on an unsupported OS" do
     let(:facts) do
       {    
-			  :osfamily => 'UNSUPPORTED',
+        :osfamily => 'UNSUPPORTED',
         :operatingsystem => 'UNSUPPORTED'
       }
-		end
-    
+    end
     it 'should gracefully fail' do
       is_expected.to compile.and_raise_error(/Unsupported platform:/)
     end