(puppetlabsgh-592) Fix spec tests to work with changes in puppetlabs#567

blkperl · Jan 28, 2014 · 7699c81 · 7699c81
1 parent 9883dcd
commit 7699c81
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 23 deletions.
diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
@@ -236,7 +236,7 @@ class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
 
     describe file(conf_file) do
       it { should be_file }
-      it { should contain 'Include /tmp/root/*.conf' }
+      it { should contain 'Include "/tmp/root/*.conf"' }
     end
   end
 

diff --git a/spec/acceptance/apache_ssl_spec.rb b/spec/acceptance/apache_ssl_spec.rb
@@ -28,12 +28,12 @@ class { 'apache':
 
     describe file("#{vhostd}/15-default-ssl.conf") do
       it { should be_file }
-      it { should contain 'SSLCertificateFile      /tmp/ssl_cert' }
-      it { should contain 'SSLCertificateKeyFile   /tmp/ssl_key' }
-      it { should contain 'SSLCertificateChainFile /tmp/ssl_chain' }
-      it { should contain 'SSLCACertificateFile    /tmp/ssl_ca' }
-      it { should contain 'SSLCARevocationPath     /tmp/ssl_crl_path' }
-      it { should contain 'SSLCARevocationFile     /tmp/ssl_crl' }
+      it { should contain 'SSLCertificateFile      "/tmp/ssl_cert"' }
+      it { should contain 'SSLCertificateKeyFile   "/tmp/ssl_key"' }
+      it { should contain 'SSLCertificateChainFile "/tmp/ssl_chain"' }
+      it { should contain 'SSLCACertificateFile    "/tmp/ssl_ca"' }
+      it { should contain 'SSLCARevocationPath     "/tmp/ssl_crl_path"' }
+      it { should contain 'SSLCARevocationFile     "/tmp/ssl_crl"' }
     end
   end
 
@@ -68,12 +68,12 @@ class { 'apache':
 
     describe file("#{vhostd}/25-test_ssl.conf") do
       it { should be_file }
-      it { should contain 'SSLCertificateFile      /tmp/ssl_cert' }
-      it { should contain 'SSLCertificateKeyFile   /tmp/ssl_key' }
-      it { should contain 'SSLCertificateChainFile /tmp/ssl_chain' }
-      it { should contain 'SSLCACertificateFile    /tmp/ssl_ca' }
-      it { should contain 'SSLCARevocationPath     /tmp/ssl_crl_path' }
-      it { should contain 'SSLCARevocationFile     /tmp/ssl_crl' }
+      it { should contain 'SSLCertificateFile      "/tmp/ssl_cert"' }
+      it { should contain 'SSLCertificateKeyFile   "/tmp/ssl_key"' }
+      it { should contain 'SSLCertificateChainFile "/tmp/ssl_chain"' }
+      it { should contain 'SSLCACertificateFile    "/tmp/ssl_ca"' }
+      it { should contain 'SSLCARevocationPath     "/tmp/ssl_crl_path"' }
+      it { should contain 'SSLCARevocationFile     "/tmp/ssl_crl"' }
       it { should contain 'SSLProxyEngine On' }
       it { should contain 'SSLProtocol             test' }
       it { should contain 'SSLCipherSuite          test' }

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
@@ -510,7 +510,7 @@ class { 'apache': }
 
     describe file("#{vhost_dir}/25-test.server.conf") do
       it { should be_file }
-      it { should contain 'CustomLog /tmp' }
+      it { should contain 'CustomLog "/tmp"' }
     end
   end
 
@@ -538,7 +538,7 @@ class { 'apache': }
 
       describe file("#{vhost_dir}/25-test.server.conf") do
         it { should be_file }
-        it { should_not contain "#{logname} /tmp" }
+        it { should_not contain "#{logname} \"/tmp\"" }
       end
     end
 
@@ -578,7 +578,7 @@ class { 'apache': }
 
       describe file("#{vhost_dir}/25-test.server.conf") do
         it { should be_file }
-        it { should contain "#{logname} syslog" }
+        it { should contain "#{logname} \"syslog\"" }
       end
     end
   end
@@ -600,7 +600,7 @@ class { 'apache': }
 
     describe file("#{vhost_dir}/25-test.server.conf") do
       it { should be_file }
-      it { should contain 'CustomLog syslog "%h %l"' }
+      it { should contain 'CustomLog \"syslog\" "%h %l"' }
     end
   end
 
@@ -621,7 +621,7 @@ class { 'apache': }
 
     describe file("#{vhost_dir}/25-test.server.conf") do
       it { should be_file }
-      it { should contain 'CustomLog syslog combined env=admin' }
+      it { should contain 'CustomLog "syslog" combined env=admin' }
     end
   end
 
@@ -640,7 +640,7 @@ class { 'apache': }
 
     describe file("#{vhost_dir}/25-test.server.conf") do
       it { should be_file }
-      it { should contain 'Alias /image /ftp/pub/image' }
+      it { should contain 'Alias /image "/ftp/pub/image"' }
     end
   end
 
@@ -659,7 +659,7 @@ class { 'apache': }
 
     describe file("#{vhost_dir}/25-test.server.conf") do
       it { should be_file }
-      it { should contain 'ScriptAlias /myscript /usr/share/myscript' }
+      it { should contain 'ScriptAlias /myscript "/usr/share/myscript"' }
     end
   end
 
@@ -701,7 +701,7 @@ class { 'apache': service_ensure => stopped, }
       it { should be_file }
       it { should contain "suPHP_AddHandler #{suphp_handler}" }
       it { should contain 'suPHP_Engine on' }
-      it { should contain "suPHP_ConfigPath #{suphp_configpath}" }
+      it { should contain "suPHP_ConfigPath \"#{suphp_configpath}\"" }
     end
   end
 
@@ -883,7 +883,7 @@ class { 'apache::mod::wsgi': }
       it { should be_file }
       it { should contain 'WSGIDaemonProcess wsgi processes=2' }
       it { should contain 'WSGIProcessGroup vagrant' }
-      it { should contain 'WSGIScriptAlias /test /test1' }
+      it { should contain 'WSGIScriptAlias /test "/test1"' }
     end
   end
 
@@ -946,7 +946,7 @@ class { 'apache::mod::fastcgi': }
       describe file("#{vhost_dir}/25-test.server.conf") do
         it { should be_file }
         it { should contain 'FastCgiExternalServer localhost -socket /tmp/fast/1234' }
-        it { should contain '<Directory /tmp/fast>' }
+        it { should contain '<Directory "/tmp/fast">' }
       end
     end
   end