Merge branch 'AddOnline-fix-filter-source'

manifests/filter.pp

@@ -92,7 +92,10 @@ define fail2ban::filter (
 
   $manage_file_content = $filtertemplate ? {
     ''        => undef,
-    default   => template($filtertemplate),
+    default   => $filtersource ? {
+      ''        => template($filtertemplate),
+      default   => undef,
+    }
   }
 
   file { "${real_filtername}.local":

spec/classes/fail2ban_spec.rb

@@ -97,12 +97,10 @@ enabled  = true/) }
   describe 'Test customizations - template' do
     let(:params) { {:template => "fail2ban/spec.erb" , :options => { 'opt_a' => 'value_a' } } }
     it 'should generate a valid template' do
-      content = catalogue.resource('file', 'fail2ban.local').send(:parameters)[:content]
-      content.should match "fqdn: rspec.example42.com"
+      should contain_file('fail2ban.local').with_content(/fqdn: rspec.example42.com/)
     end
     it 'should generate a template that uses custom options' do
-      content = catalogue.resource('file', 'fail2ban.local').send(:parameters)[:content]
-      content.should match "value_a"
+      should contain_file('fail2ban.local').with_content(/value_a/)
     end
   end
 
@@ -136,8 +134,7 @@ enabled  = true/) }
       }
     end
     it 'should not automatically restart the service, when service_autorestart => false' do
-      content = catalogue.resource('file', 'fail2ban.local').send(:parameters)[:notify]
-      content.should be_nil
+      should contain_file('fail2ban.local').with_notify(nil)
     end
   end
 

spec/defines/fail2ban_filter_spec.rb

@@ -61,7 +61,7 @@ b = 2
 not c
 "
      end
- 
+
      it { should contain_file('sample2.local').with_path('/etc/fail2ban/filter.d/sample2.local').with_content(expected) }
      it { should contain_file('sample2.local').without_source }
    end
@@ -75,6 +75,7 @@ not c
     end
 
     it { should contain_file('sample3.local').with_path('/etc/fail2ban/filter.d/sample3.local').with_source('puppet:///some/path/to/source') }
+    it { should contain_file('sample3.local').with_content(nil) }
     it { should contain_file('sample3.local').without_template }
   end
 end