serverspec 0.4.9 → 0.4.10

data/lib/serverspec/commands/darwin.rb

@@ -11,7 +11,7 @@ module Serverspec
 
       def check_mode file, mode
         regexp = "^#{mode}$"
-        "stat -f %A #{escape(file)} | grep -- #{escape(regexp)}"
+        "stat -f%Lp #{escape(file)} | grep -- #{escape(regexp)}"
       end
 
       def check_owner file, owner
@@ -25,7 +25,7 @@ module Serverspec
       end
 
       def get_mode(file)
-        "stat -f %A #{escape(file)}"
+        "stat -f%Lp #{escape(file)}"
       end
 
       def check_access_by_user file, user, access

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.4.9"
+  VERSION = "0.4.10"
 end

data/spec/darwin/commands_spec.rb

@@ -3,125 +3,47 @@ require 'spec_helper'
 include Serverspec::Helper::Darwin
 
 describe 'Serverspec commands of Darwin family' do
+  it_behaves_like 'support command check_file', '/etc/passwd'
+  it_behaves_like 'support command check_directory', '/var/log'
+
   it_behaves_like 'support command check_installed_by_gem', 'jekyll'
   it_behaves_like 'support command check_installed_by_gem', 'jekyll', '1.0.2'
-end
-
-describe 'check_file' do
-  subject { commands.check_file('/etc/passwd') }
-  it { should eq 'test -f /etc/passwd' }
-end
-
-describe 'check_mounted'  do
-  subject { commands.check_mounted('/') }
-  it { should eq "mount | grep -w -- on\\ /" }
-end
-
-describe 'check_reachable'  do
-  context "connect with name from /etc/services to localhost" do
-    subject { commands.check_reachable('localhost', 'ssh', 'tcp', 1) }
-    it { should eq "nc -vvvvzt localhost ssh -w 1" }
-  end
-  context "connect with ip and port 11111 and timeout of 5" do
-    subject { commands.check_reachable('127.0.0.1', '11111', 'udp', 5) }
-    it { should eq "nc -vvvvzu 127.0.0.1 11111 -w 5" }
-  end
-  context "do a ping" do
-    subject { commands.check_reachable('127.0.0.1', nil, 'icmp', 1) }
-    it { should eq "ping -n 127.0.0.1 -w 1 -c 2" }
-  end
-end
-
-describe 'check_routing_table' do
-  subject { commands.check_routing_table('192.168.100.0/24') }
-  it { should eq "/sbin/ip route | grep -E '^192.168.100.0/24 |^default '" }
-end
-
-describe 'check_resolvable'  do
-  context "resolve localhost by hosts" do
-    subject { commands.check_resolvable('localhost', 'hosts') }
-    it { should eq "grep -w -- localhost /etc/hosts" }
-  end
-  context "resolve localhost by dns" do
-    subject { commands.check_resolvable('localhost', 'dns') }
-    it { should eq "nslookup -timeout=1 localhost" }
-  end
-  context "resolve localhost with default settings" do
-    subject { commands.check_resolvable('localhost',nil) }
-    it { should eq 'getent hosts localhost' }
-  end
-end
 
-describe 'check_directory' do
-  subject { commands.check_directory('/var/log') }
-  it { should eq 'test -d /var/log' }
-end
+  it_behaves_like 'support command check_mounted', '/'
 
-describe 'check_user' do
-  subject { commands.check_user('root') }
-  it { should eq 'id root' }
-end
+  it_behaves_like 'support command check_routing_table', '192.168.100.1/24'
+  it_behaves_like 'support command check_reachable'
+  it_behaves_like 'support command check_resolvable'
 
-describe 'check_group' do
-  subject { commands.check_group('wheel') }
-  it { should eq 'getent group | grep -wq -- wheel' }
-end
+  it_behaves_like 'support command check_user', 'root'
+  it_behaves_like 'support command check_user', 'wheel'
 
-describe 'check_listening' do
-  subject { commands.check_listening(80) }
-  it { should eq "netstat -tunl | grep -- :80\\ " }
-end
+  it_behaves_like 'support command check_listening', 80
 
-describe 'check_running' do
-  subject { commands.check_running('httpd') }
-  it { should eq '/sbin/service httpd status' }
-end
+  it_behaves_like 'support command check_running_under_supervisor', 'httpd'
+  it_behaves_like 'support command check_process', 'httpd'
 
-describe 'check_running_under_supervisor' do
-  subject { commands.check_running_under_supervisor('httpd') }
-  it { should eq 'supervisorctl status httpd' }
-end
+  it_behaves_like 'support command check_file_contain', '/etc/passwd', 'root'
+  it_behaves_like 'support command check_file_contain_within'
 
-describe 'check_process' do
-  subject { commands.check_process('httpd') }
-  it { should eq 'ps aux | grep -w -- httpd | grep -qv grep' }
-end
+  it_behaves_like 'support command check_cron_entry'
 
-describe 'check_file_contain' do
-  subject { commands.check_file_contain('/etc/passwd', 'root') }
-  it { should eq "grep -q -- root /etc/passwd" }
-end
+  it_behaves_like 'support command check_link', '/etc/system-release', '/etc/darwin-release'
 
-describe 'check_file_contain_within' do
-  context 'contain a pattern in the file' do
-    subject { commands.check_file_contain_within('Gemfile', 'rspec') }
-    it { should eq "sed -n 1,\\$p Gemfile | grep -q -- rspec -" }
-  end
+  it_behaves_like 'support command check_belonging_group', 'root', 'wheel'
 
-  context 'contain a pattern after a line in a file' do
-    subject { commands.check_file_contain_within('Gemfile', 'rspec', '/^group :test do/') }
-    it { should eq "sed -n /\\^group\\ :test\\ do/,\\$p Gemfile | grep -q -- rspec -" }
-  end
+  it_behaves_like 'support command check_uid', 'root', 0
+  it_behaves_like 'support command check_gid', 'root', 0
 
-  context 'contain a pattern before a line in a file' do
-    subject {commands.check_file_contain_within('Gemfile', 'rspec', nil, '/^end/') }
-    it { should eq "sed -n 1,/\\^end/p Gemfile | grep -q -- rspec -" }
-  end
+  it_behaves_like 'support command check_login_shell', 'root', '/bin/bash'
+  it_behaves_like 'support command check_home_directory', 'root', '/root'
 
-  context 'contain a pattern from within a line and another line in a file' do
-    subject { commands.check_file_contain_within('Gemfile', 'rspec', '/^group :test do/', '/^end/') }
-    it { should eq "sed -n /\\^group\\ :test\\ do/,/\\^end/p Gemfile | grep -q -- rspec -" }
-  end
-end
-
-describe 'check_file_md5checksum' do
-  subject { commands.check_file_md5checksum('/usr/bin/rsync', '03ba2dcdd50ec3a7a45d3900902a83ce') }
-  it { should eq "openssl md5 /usr/bin/rsync | cut -d'=' -f2 | cut -c 2- | grep -E ^03ba2dcdd50ec3a7a45d3900902a83ce$" }
+  it_behaves_like 'support command check_authorized_key'
 end
 
 describe 'check_mode' do
   subject { commands.check_mode('/etc/sudoers', 440) }
-  it { should eq 'stat -f %A /etc/sudoers | grep -- \\^440\\$' }
+  it { should eq 'stat -f%Lp /etc/sudoers | grep -- \\^440\\$' }
 end
 
 describe 'check_owner' do
@@ -134,69 +56,9 @@ describe 'check_grouped' do
   it { should eq 'stat -f %Sg /etc/passwd | grep -- \\^wheel\\$' }
 end
 
-describe 'check_cron_entry' do
-  context 'specify root user' do
-    subject { commands.check_cron_entry('root', '* * * * * /usr/local/bin/batch.sh') }
-    it { should eq 'crontab -u root -l | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
-  end
-
-  context 'no specified user' do
-    subject { commands.check_cron_entry(nil, '* * * * * /usr/local/bin/batch.sh') }
-    it { should eq 'crontab -l | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
-  end
-end
-
-describe 'check_link' do
-  subject { commands.check_link('/etc/system-release', '/etc/darwin-release') }
-  it { should eq 'stat -c %N /etc/system-release | grep -- /etc/darwin-release' }
-end
-
-describe 'check_belonging_group' do
-  subject { commands.check_belonging_group('root', 'wheel') }
-  it { should eq "id root | awk '{print $3}' | grep -- wheel" }
-end
-
-describe 'have_gid' do
-  subject { commands.check_gid('root', 0) }
-  it { should eq "getent group | grep -w -- \\^root | cut -f 3 -d ':' | grep -w -- 0" }
-end
-
-describe 'have_uid' do
-  subject { commands.check_uid('root', 0) }
-  it { should eq "id root | grep -- \\^uid\\=0\\(" }
-end
-
-describe 'have_login_shell' do
-  subject { commands.check_login_shell('root', '/bin/bash') }
-  it { should eq "getent passwd root | cut -f 7 -d ':' | grep -w -- /bin/bash" }
-end
-
-describe 'have_home_directory' do
-  subject { commands.check_home_directory('root', '/root') }
-  it { should eq "getent passwd root | cut -f 6 -d ':' | grep -w -- /root" }
-end
-
-describe 'have_authorized_key' do
-  key = "ssh-rsa ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGH"
-  escaped_key = key.gsub(/ /, '\ ')
-
-  context 'with commented publickey' do
-    commented_key = key + " foo@bar.local"
-    subject { commands.check_authorized_key('root', commented_key) }
-    describe 'when command insert publickey is removed comment' do
-      it { should eq "grep -w -- #{escaped_key} ~root/.ssh/authorized_keys" }
-    end
-  end
-
-  context 'with uncomented publickey' do
-    subject { commands.check_authorized_key('root', key) }
-    it { should eq "grep -w -- #{escaped_key} ~root/.ssh/authorized_keys" }
-  end
-end
-
 describe 'get_mode' do
   subject { commands.get_mode('/dev') }
-  it { should eq 'stat -f %A /dev' }
+  it { should eq 'stat -f%Lp /dev' }
 end
 
 describe 'check_access_by_user' do
@@ -215,3 +77,8 @@ describe 'check_access_by_user' do
     it { should eq 'sudo -u dummyuser3 -s /bin/test -x /tmp/somethingx' }
   end
 end
+
+describe 'check_file_md5checksum' do
+  subject { commands.check_file_md5checksum('/usr/bin/rsync', '03ba2dcdd50ec3a7a45d3900902a83ce') }
+  it { should eq "openssl md5 /usr/bin/rsync | cut -d'=' -f2 | cut -c 2- | grep -E ^03ba2dcdd50ec3a7a45d3900902a83ce$" }
+end

data/spec/debian/commands_spec.rb

@@ -3,256 +3,68 @@ require 'spec_helper'
 include Serverspec::Helper::Debian
 
 describe 'Serverspec commands of Debian family' do
+  it_behaves_like 'support command check_file', '/etc/passwd'
+  it_behaves_like 'support command check_directory', '/var/log'
+
   it_behaves_like 'support command check_installed_by_gem', 'jekyll'
   it_behaves_like 'support command check_installed_by_gem', 'jekyll', '1.0.2'
-end
 
-describe 'check_enabled' do
-  subject { commands.check_enabled('httpd') }
-  it { should eq 'ls /etc/rc3.d/ | grep -- httpd' }
-end
+  it_behaves_like 'support command check_mounted', '/'
 
-describe 'check_file'  do
-  subject { commands.check_file('/etc/passwd') }
-  it { should eq 'test -f /etc/passwd' }
-end
+  it_behaves_like 'support command check_routing_table', '192.168.100.1/24'
+  it_behaves_like 'support command check_reachable'
+  it_behaves_like 'support command check_resolvable'
 
-describe 'check_mounted'  do
-  subject { commands.check_mounted('/') }
-  it { should eq "mount | grep -w -- on\\ /" }
-end
+  it_behaves_like 'support command check_user', 'root'
+  it_behaves_like 'support command check_user', 'wheel'
 
-describe 'check_routing_table' do
-  subject { commands.check_routing_table('192.168.100.0/24') }
-  it { should eq "/sbin/ip route | grep -E '^192.168.100.0/24 |^default '" }
-end
+  it_behaves_like 'support command check_listening', 80
 
-describe 'check_reachable'  do
-  context "connect with name from /etc/services to localhost" do
-    subject { commands.check_reachable('localhost', 'ssh', 'tcp', 1) }
-    it { should eq "nc -vvvvzt localhost ssh -w 1" }
-  end
-  context "connect with ip and port 11111 and timeout of 5" do
-    subject { commands.check_reachable('127.0.0.1', '11111', 'udp', 5) }
-    it { should eq "nc -vvvvzu 127.0.0.1 11111 -w 5" }
-  end
-  context "do a ping" do
-    subject { commands.check_reachable('127.0.0.1', nil, 'icmp', 1) }
-    it { should eq "ping -n 127.0.0.1 -w 1 -c 2" }
-  end
-end
+  it_behaves_like 'support command check_file_md5checksum', '/etc/passewd', '96c8c50f81a29965f7af6de371ab4250'
 
-describe 'check_resolvable'  do
-  context "resolve localhost by hosts" do
-    subject { commands.check_resolvable('localhost', 'hosts') }
-    it { should eq "grep -w -- localhost /etc/hosts" }
-  end
-  context "resolve localhost by dns" do
-    subject { commands.check_resolvable('localhost', 'dns') }
-    it { should eq "nslookup -timeout=1 localhost" }
-  end
-  context "resolve localhost with default settings" do
-    subject { commands.check_resolvable('localhost',nil) }
-    it { should eq 'getent hosts localhost' }
-  end
-end
+  it_behaves_like 'support command check_running_under_supervisor', 'httpd'
+  it_behaves_like 'support command check_process', 'httpd'
 
-describe 'check_file_md5checksum' do
-  subject { commands.check_file_md5checksum('/etc/passwd', '96c8c50f81a29965f7af6de371ab4250') }
-  it { should eq "md5sum /etc/passwd | grep -iw -- ^96c8c50f81a29965f7af6de371ab4250" }
-end
+  it_behaves_like 'support command check_file_contain', '/etc/passwd', 'root'
+  it_behaves_like 'support command check_file_contain_within'
 
+  it_behaves_like 'support command check_mode', '/etc/sudoers', 440
+  it_behaves_like 'support command check_owner', '/etc/sudoers', 'root'
+  it_behaves_like 'support command check_grouped', '/etc/sudoers', 'wheel'
 
-describe 'check_directory'  do
-  subject { commands.check_directory('/var/log') }
-  it { should eq 'test -d /var/log' }
-end
+  it_behaves_like 'support command check_cron_entry'
 
-describe 'check_user'  do
-  subject { commands.check_user('root') }
-  it { should eq 'id root' }
-end
+  it_behaves_like 'support command check_link', '/etc/system-release', '/etc/redhat-release'
 
-describe 'check_group'  do
-  subject { commands.check_group('wheel') }
-  it { should eq 'getent group | grep -wq -- wheel' }
-end
+  it_behaves_like 'support command check_belonging_group', 'root', 'wheel'
 
-describe 'check_installed'  do
-  subject { commands.check_installed('httpd') }
-  it { should eq 'dpkg -s httpd' }
-end
+  it_behaves_like 'support command check_uid', 'root', 0
+  it_behaves_like 'support command check_gid', 'root', 0
 
-describe 'check_listening' do
-  subject { commands.check_listening(80) }
-  it { should eq "netstat -tunl | grep -- :80\\ " }
-end
-
-describe 'check_running' do
-  subject { commands.check_running('httpd') }
-  it { should eq '/sbin/service httpd status' }
-end
-
-
-describe 'check_running_under_supervisor' do
-  subject { commands.check_running_under_supervisor('httpd') }
-  it { should eq 'supervisorctl status httpd' }
-end
+  it_behaves_like 'support command check_login_shell', 'root', '/bin/bash'
+  it_behaves_like 'support command check_home_directory', 'root', '/root'
 
-describe 'check_process' do
-  subject { commands.check_process('httpd') }
-  it { should eq 'ps aux | grep -w -- httpd | grep -qv grep' }
-end
-
-describe 'check_file_contain' do
-  subject { commands.check_file_contain('/etc/passwd', 'root') }
-  it { should eq "grep -q -- root /etc/passwd" }
-end
+  it_behaves_like 'support command check_authorized_key'
 
-describe 'check_file_contain_within' do
-  context 'contain a pattern in the file' do
-    subject { commands.check_file_contain_within('Gemfile', 'rspec') }
-    it { should eq "sed -n 1,\\$p Gemfile | grep -q -- rspec -" }
-  end
+  it_behaves_like 'support command check_iptables'
+  it_behaves_like 'support command check_selinux'
 
-  context 'contain a pattern after a line in a file' do
-    subject { commands.check_file_contain_within('Gemfile', 'rspec', '/^group :test do/') }
-    it { should eq "sed -n /\\^group\\ :test\\ do/,\\$p Gemfile | grep -q -- rspec -" }
-  end
+  it_behaves_like 'support command get_mode'
 
-  context 'contain a pattern before a line in a file' do
-    subject {commands.check_file_contain_within('Gemfile', 'rspec', nil, '/^end/') }
-    it { should eq "sed -n 1,/\\^end/p Gemfile | grep -q -- rspec -" }
-  end
-
-  context 'contain a pattern from within a line and another line in a file' do
-    subject { commands.check_file_contain_within('Gemfile', 'rspec', '/^group :test do/', '/^end/') }
-    it { should eq "sed -n /\\^group\\ :test\\ do/,/\\^end/p Gemfile | grep -q -- rspec -" }
-  end
+  it_behaves_like 'support command check_access_by_user'
 end
 
-describe 'check_mode' do
-  subject { commands.check_mode('/etc/sudoers', 440) }
-  it { should eq 'stat -c %a /etc/sudoers | grep -- \\^440\\$' }
-end
-
-describe 'check_owner' do
-  subject { commands.check_owner('/etc/passwd', 'root') }
-  it { should eq 'stat -c %U /etc/passwd | grep -- \\^root\\$' }
-end
-
-describe 'check_grouped' do
-  subject { commands.check_grouped('/etc/passwd', 'wheel') }
-  it { should eq 'stat -c %G /etc/passwd | grep -- \\^wheel\\$' }
-end
-
-describe 'check_cron_entry' do
-  context 'specify root user' do
-    subject { commands.check_cron_entry('root', '* * * * * /usr/local/bin/batch.sh') }
-    it { should eq 'crontab -u root -l | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
-  end
-
-  context 'no specified user' do
-    subject { commands.check_cron_entry(nil, '* * * * * /usr/local/bin/batch.sh') }
-    it { should eq 'crontab -l | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
-  end
-end
-
-describe 'check_link' do
-  subject { commands.check_link('/etc/system-release', '/etc/redhat-release') }
-  it { should eq 'stat -c %N /etc/system-release | grep -- /etc/redhat-release' }
-end
-
-describe 'check_belonging_group' do
-  subject { commands.check_belonging_group('root', 'wheel') }
-  it { should eq "id root | awk '{print $3}' | grep -- wheel" }
-end
-
-describe 'have_gid' do
-  subject { commands.check_gid('root', 0) }
-  it { should eq "getent group | grep -w -- \\^root | cut -f 3 -d ':' | grep -w -- 0" }
-end
-
-describe 'have_uid' do
-  subject { commands.check_uid('root', 0) }
-  it { should eq "id root | grep -- \\^uid\\=0\\(" }
-end
-
-describe 'have_login_shell' do
-  subject { commands.check_login_shell('root', '/bin/bash') }
-  it { should eq "getent passwd root | cut -f 7 -d ':' | grep -w -- /bin/bash" }
-end
-
-describe 'have_home_directory' do
-  subject { commands.check_home_directory('root', '/root') }
-  it { should eq "getent passwd root | cut -f 6 -d ':' | grep -w -- /root" }
-end
-
-describe 'have_authorized_key' do
-  key = "ssh-rsa ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGH"
-  escaped_key = key.gsub(/ /, '\ ')
-
-  context 'with commented publickey' do
-    commented_key = key + " foo@bar.local"
-    subject { commands.check_authorized_key('root', commented_key) }
-    describe 'when command insert publickey is removed comment' do
-      it { should eq "grep -w -- #{escaped_key} ~root/.ssh/authorized_keys" }
-    end
-  end
-
-  context 'with uncomented publickey' do
-    subject { commands.check_authorized_key('root', key) }
-    it { should eq "grep -w -- #{escaped_key} ~root/.ssh/authorized_keys" }
-  end
-end
-
-describe 'check_ipatbles' do
-  context 'check a rule without a table and a chain' do
-    subject { commands.check_iptables_rule('-P INPUT ACCEPT') }
-    it { should eq "/sbin/iptables -S | grep -- -P\\ INPUT\\ ACCEPT" }
-  end
-
-  context 'chack a rule with a table and a chain' do
-    subject { commands.check_iptables_rule('-P INPUT ACCEPT', 'mangle', 'INPUT') }
-    it { should eq "/sbin/iptables -t mangle -S INPUT | grep -- -P\\ INPUT\\ ACCEPT" }
-  end
-end
-
-describe 'check_selinux' do
-  context 'enforcing' do
-    subject { commands.check_selinux('enforcing') }
-    it { should eq "/usr/sbin/getenforce | grep -i -- enforcing" }
-  end
-
-  context 'permissive' do
-    subject { commands.check_selinux('permissive') }
-    it { should eq "/usr/sbin/getenforce | grep -i -- permissive" }
-  end
-
-  context 'disabled' do
-    subject { commands.check_selinux('disabled') }
-    it { should eq "/usr/sbin/getenforce | grep -i -- disabled" }
-  end
+describe 'check_enabled' do
+  subject { commands.check_enabled('httpd') }
+  it { should eq 'ls /etc/rc3.d/ | grep -- httpd' }
 end
 
-describe 'get_mode' do
-  subject { commands.get_mode('/dev') }
-  it { should eq 'stat -c %a /dev' }
+describe 'check_installed'  do
+  subject { commands.check_installed('httpd') }
+  it { should eq 'dpkg -s httpd' }
 end
 
-describe 'check_access_by_user' do
-  context 'read access' do
-    subject {commands.check_access_by_user '/tmp/something', 'dummyuser1', 'r'}
-    it { should eq  'su -s /bin/sh -c "/usr/bin/test -r /tmp/something" dummyuser1' }
-  end
-
-  context 'write access' do
-    subject {commands.check_access_by_user '/tmp/somethingw', 'dummyuser2', 'w'}
-    it { should eq  'su -s /bin/sh -c "/usr/bin/test -w /tmp/somethingw" dummyuser2' }
-  end
-
-  context 'execute access' do
-    subject {commands.check_access_by_user '/tmp/somethingx', 'dummyuser3', 'x'}
-    it { should eq  'su -s /bin/sh -c "/usr/bin/test -x /tmp/somethingx" dummyuser3' }
-  end
+describe 'check_running' do
+  subject { commands.check_running('httpd') }
+  it { should eq '/sbin/service httpd status' }
 end