Merge pull request #1226 from DavidS/MODULES-2655-fix-sslprotocol-test

(MODULES-2655) Fix acceptance testing for SSLProtocol behaviour for real
xbezdick · Oct 14, 2015 · 9c1047d · 9c1047d
2 parents 3c953de + 72df6f3
commit 9c1047d
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
@@ -1345,11 +1345,13 @@ class { 'apache': }
       pp = <<-EOS
         class { 'apache': }
         apache::vhost { 'test.server':
-          docroot => '/tmp',
+          docroot      => '/tmp',
+          ssl          => true,
           ssl_protocol => ['All', '-SSLv2'],
         }
         apache::vhost { 'test2.server':
-          docroot => '/tmp',
+          docroot      => '/tmp',
+          ssl          => true,
           ssl_protocol => 'All -SSLv2',
         }
       EOS
@@ -1358,12 +1360,12 @@ class { 'apache': }
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
       it { is_expected.to be_file }
-      it { is_expected.to contain 'SSLProtocol All -SSLv2' }
+      it { is_expected.to contain 'SSLProtocol  *All -SSLv2' }
     end
 
     describe file("#{$vhost_dir}/25-test2.server.conf") do
       it { is_expected.to be_file }
-      it { is_expected.to contain 'SSLProtocol All -SSLv2' }
+      it { is_expected.to contain 'SSLProtocol  *All -SSLv2' }
     end
   end
 end