lib/serverspec/setup.rb in serverspec-2.0.0.beta8 vs lib/serverspec/setup.rb in serverspec-2.0.0.beta9

@@ -92,29 +92,29 @@
 
     def self.safe_create_spec
       content = <<-EOF
 require 'spec_helper'
 
-describe package('httpd'), :if => os[:family] == 'RedHat' do
+describe package('httpd'), :if => os[:family] == 'redhat' do
   it { should be_installed }
 end
 
-describe package('apache2'), :if => os[:family] == 'Ubuntu' do
+describe package('apache2'), :if => os[:family] == 'ubuntu' do
   it { should be_installed }
 end
 
-describe service('httpd'), :if => os[:family] == 'RedHat' do
+describe service('httpd'), :if => os[:family] == 'redhat' do
   it { should be_enabled }
   it { should be_running }
 end
 
-describe service('apache2'), :if => os[:family] == 'Ubuntu' do
+describe service('apache2'), :if => os[:family] == 'ubuntu' do
   it { should be_enabled }
   it { should be_running }
 end
 
-describe service('org.apache.httpd'), :if => os[:family] == 'Darwin' do
+describe service('org.apache.httpd'), :if => os[:family] == 'darwin' do
   it { should be_enabled }
   it { should be_running }
 end
 
 describe port(80) do
@@ -249,12 +249,10 @@
 <% if @backend_type == 'WinRM' -%>
 require 'winrm'
 <% end -%>
 
 include Specinfra::Helper::<%= @backend_type %>
-<% if @os_type == 'UN*X' -%>
-include Specinfra::Helper::DetectOS
-<% else -%>
+<% if @os_type != 'UN*X' -%>
 include Specinfra::Helper::Windows
 <% end -%>
 
 <% if @os_type == 'UN*X' && @backend_type == 'Ssh' -%>
 if ENV['ASK_SUDO_PASSWORD']