Merge pull request #858 from justinstoller/bug/master/1907-fixup-mod_…

…negotiation (FM-1907) Fix mod_negotation system tests
redhat-openstack · Sep 23, 2014 · c54405e · c54405e
2 parents 5cb7f96 + 9bd66e0
commit c54405e
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/spec/acceptance/mod_negotiation_spec.rb b/spec/acceptance/mod_negotiation_spec.rb
@@ -19,13 +19,13 @@
   context "default negotiation config" do
     it 'succeeds in puppeting negotiation' do
       pp= <<-EOS
-        class { '::apache': }
+        class { '::apache': default_mods => false }
         class { '::apache::mod::negotiation': }
       EOS
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{$mod_dir}/negotiation.conf") do
+    describe file("#{mod_dir}/negotiation.conf") do
       it { should contain "LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW
 ForceLanguagePriority Prefer Fallback" }
     end
@@ -39,15 +39,15 @@ class { '::apache::mod::negotiation': }
   context "with alternative force_language_priority" do
     it 'succeeds in puppeting negotiation' do
       pp= <<-EOS
-        class { '::apache': }
+        class { '::apache': default_mods => false }
         class { '::apache::mod::negotiation':
           force_language_priority => 'Prefer',
         }
       EOS
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{$mod_dir}/negotiation.conf") do
+    describe file("#{mod_dir}/negotiation.conf") do
       it { should contain "ForceLanguagePriority Prefer" }
     end
 
@@ -60,15 +60,15 @@ class { '::apache::mod::negotiation':
   context "with alternative language_priority" do
     it 'succeeds in puppeting negotiation' do
       pp= <<-EOS
-        class { '::apache': }
+        class { '::apache': default_mods => false }
         class { '::apache::mod::negotiation':
           language_priority => [ 'en', 'es' ],
         }
       EOS
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{$mod_dir}/negotiation.conf") do
+    describe file("#{mod_dir}/negotiation.conf") do
       it { should contain "LanguagePriority en es" }
     end