Merge pull request #1 from mhaskel/docroot_test_fixup

Fix unit test failures with ruby 1.8.7
redhat-openstack · Nov 7, 2014 · 64cb858 · 64cb858
2 parents 38d7970 + a65f3f7
commit 64cb858
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
@@ -24,7 +24,7 @@
     it { is_expected.to contain_group("www-data") }
     it { is_expected.to contain_class("apache::service") }
     it { is_expected.to contain_file("/var/www").with(
-      'ensure'  => 'directory',
+      'ensure'  => 'directory'
       )
     }
     it { is_expected.to contain_file("/etc/apache2/sites-enabled").with(
@@ -168,7 +168,7 @@
         end
 
         it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b" vhost_common\n} }
-        it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" vhost_combined\n} }
+        it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%\{Referer\}i\" \"%\{User-agent\}i\"" vhost_combined\n} }
       end
     end
 
@@ -230,7 +230,7 @@
     it { is_expected.to contain_group("apache") }
     it { is_expected.to contain_class("apache::service") }
     it { is_expected.to contain_file("/var/www/html").with(
-      'ensure'  => 'directory',
+      'ensure'  => 'directory'
       )
     }
     it { is_expected.to contain_file("/etc/httpd/conf.d").with(
@@ -507,7 +507,7 @@
     it { is_expected.to contain_group("www") }
     it { is_expected.to contain_class("apache::service") }
     it { is_expected.to contain_file("/usr/local/www/apache22/data").with(
-      'ensure'  => 'directory',
+      'ensure'  => 'directory'
       )
     }
     it { is_expected.to contain_file("/usr/local/etc/apache22/Vhosts").with(