Fix spec tests and rubocop errors

diff --git a/lib/puppet/type/mailalias.rb b/lib/puppet/type/mailalias.rb
index fde34be7f1a5e7748eb7b70a3aa90ceab851701f..59c88ef73812679263e2d375e949601417597f76 100644 (file)
--- a/lib/puppet/type/mailalias.rb
+++ b/lib/puppet/type/mailalias.rb
@@ -2,13 +2,13 @@
 module Puppet
   Type.newtype(:mailalias) do
     desc <<-DESC
-Creates an email alias in the local alias database.
+  Creates an email alias in the local alias database.
 
-@example using mailalias to redirect mail for the ftp account to root's mailbox
-mailalias { 'ftp':
-  ensure => present,
-  recipient => 'root',
-}
+  @example using mailalias to redirect mail for the ftp account to root's mailbox
+  mailalias { 'ftp':
+    ensure => present,
+    recipient => 'root',
+  }
     DESC
 
     ensurable

diff --git a/spec/acceptance/tests/destroy_spec.rb b/spec/acceptance/tests/destroy_spec.rb
index 499b613079995f4742247ed89164abd893280c47..4a740db9f8d1610d9406ddee01a2be0a0b1896a6 100644 (file)
--- a/spec/acceptance/tests/destroy_spec.rb
+++ b/spec/acceptance/tests/destroy_spec.rb
@@ -12,7 +12,7 @@ RSpec.context 'should delete an email alias' do
       on(agent, "echo '#{name}: foo,bar,baz' >> /etc/aliases")
 
       # (setup) verify the alias exists
-      on(agent, 'cat /etc/aliases')  do |res|
+      on(agent, 'cat /etc/aliases') do |res|
         assert_match(%r{#{name}:.*foo,bar,baz}, res.stdout, 'mailalias not in aliases file')
       end
     end

diff --git a/spec/acceptance/tests/modify_spec.rb b/spec/acceptance/tests/modify_spec.rb
index b3937dc84fd3548767d622ec470ed0c871a624de..f4ea7bf624d05a9a36ce62dd9b868cd3dd3b70fd 100644 (file)
--- a/spec/acceptance/tests/modify_spec.rb
+++ b/spec/acceptance/tests/modify_spec.rb
@@ -13,7 +13,7 @@ RSpec.context 'should modify an email alias' do
       on(agent, "echo '#{name}: foo,bar,baz' >> /etc/aliases")
 
       # (setup) verify the alias exists
-      on(agent, 'cat /etc/aliases')  do |res|
+      on(agent, 'cat /etc/aliases') do |res|
         assert_match(%r{#{name}:.*foo,bar,baz}, res.stdout, 'mailalias not in aliases file')
       end
     end
@@ -34,7 +34,7 @@ RSpec.context 'should modify an email alias' do
     end
 
     it 'verifies the updated alias is present' do
-      on(agent, 'cat /etc/aliases')  do |res|
+      on(agent, 'cat /etc/aliases') do |res|
         assert_match(%r{#{name}:.*foo,bar,baz,blarvitz}, res.stdout, 'updated mailalias not in aliases file')
       end
     end

diff --git a/spec/acceptance/tests/query_spec.rb b/spec/acceptance/tests/query_spec.rb
index c888a0b1c0ac86dfb4496ea70778e30197259a64..1a7ab42a6d180b847c300d592a3d20d60aad4e0f 100644 (file)
--- a/spec/acceptance/tests/query_spec.rb
+++ b/spec/acceptance/tests/query_spec.rb
@@ -12,7 +12,7 @@ RSpec.context 'should be able to find an exisitng email alias' do
       on(agent, "echo '#{name}: foo,bar,baz' >> /etc/aliases")
 
       # (setup) verify the alias exists
-      on(agent, 'cat /etc/aliases')  do |res|
+      on(agent, 'cat /etc/aliases') do |res|
         assert_match(%r{#{name}:.*foo,bar,baz}, res.stdout, 'mailalias not in aliases file')
       end
     end

diff --git a/spec/integration/provider/mailalias/aliases_spec.rb b/spec/integration/provider/mailalias/aliases_spec.rb
old mode 100755 (executable)
new mode 100644 (file)
index 29098f8..ae9dc10
--- a/spec/integration/provider/mailalias/aliases_spec.rb
+++ b/spec/integration/provider/mailalias/aliases_spec.rb
@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'shared_behaviours/all_parsedfile_providers'
 

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 218a34dc905285e907f18fa1d02e8f4d9f1a5525..0adde24ac09e7a0c5aa49cb76e2530431847a290 100644 (file)
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -10,7 +10,7 @@ def beaker_opts
 end
 
 def non_windows_agents
-  agents.select { |agent| !agent['platform'].include?('windows') }
+  agents.reject { |agent| agent['platform'].include?('windows') }
 end
 
 RSpec.configure do |c|

diff --git a/spec/unit/type/mailalias_spec.rb b/spec/unit/type/mailalias_spec.rb
old mode 100755 (executable)
new mode 100644 (file)
index 2a079ba..1fb195e
--- a/spec/unit/type/mailalias_spec.rb
+++ b/spec/unit/type/mailalias_spec.rb
@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe Puppet::Type.type(:mailalias) do