Don't include the NameVirtualHost directives in apache >= 2.4, and ad…

…d tests for this that will at least work with Ubuntu 13.10 and Ubuntu 14.04.

Tests will still work anywhere with apache < 2.4, but haven't been updated to support RHEL7 yet.

manifests/vhost.pp

@@ -348,7 +348,7 @@
     }
   }
   if ! $ip_based {
-    if ! defined(Apache::Namevirtualhost[$nvh_addr_port]) and $ensure == 'present' {
+    if ! defined(Apache::Namevirtualhost[$nvh_addr_port]) and $ensure == 'present' and $apache_version < 2.4 {
       ::apache::namevirtualhost { $nvh_addr_port: }
     }
   }

spec/acceptance/vhost_spec.rb

@@ -484,6 +484,16 @@ class { 'apache': }
       apply_manifest(pp, :catch_failures => true)
     end
 
+    describe file($ports_file) do
+      it { should be_file }
+      case fact('lsbdistcodename')
+      when 'saucy', 'trusty'
+        it { should_not contain 'NameVirtualHost test.server' }
+      else
+        it { should contain 'NameVirtualHost test.server' }
+      end
+    end
+
     describe file("#{$vhost_dir}/10-test.server.conf") do
       it { should be_file }
     end