lib/serverspec/setup.rb in serverspec-0.4.6 vs lib/serverspec/setup.rb in serverspec-0.4.7

@@ -32,20 +32,23 @@
     def self.safe_create_spec
 
       content = <<-EOF
 require 'spec_helper'
 
-describe 'httpd' do
+describe package('httpd') do
   it { should be_installed }
+end
+
+describe service('httpd') do
   it { should be_enabled   }
   it { should be_running   }
 end
 
-describe 'port 80' do
+describe port(80) do
   it { should be_listening }
 end
 
-describe '/etc/httpd/conf/httpd.conf' do
+describe file('/etc/httpd/conf/httpd.conf') do
   it { should be_file }
   it { should contain "ServerName #{@hostname}" }
 end
 EOF