serverspec 2.0.0.beta19 → 2.0.0.beta20

data/spec/type/base/port_spec.rb

@@ -2,32 +2,33 @@ require 'spec_helper'
 
 set :os, :family => 'base'
 
-describe Serverspec::Type::Port do
-  describe port(80) do
-    it { should be_listening }
+describe port(80) do
+  it { should be_listening }
+end
 
-    it('protocol: tcp') { should be_listening.with('tcp') }
+describe port(80) do
+  it { should be_listening.with('tcp') }
+end
 
-    it 'invalid protocol raises error' do
+describe port(80) do
+  it do
       expect {
         should be_listening.with('not implemented')
       }.to raise_error(ArgumentError, %r/\A`be_listening` matcher doesn\'t support/)
     end
+end
 
-    it('on: 127.0.0.1') do
-      should be_listening.on('127.0.0.1')
-    end
-
-    it 'invalid local address raises error' do
-      expect{ should be_listening.on('') }.to raise_error(ArgumentError)
-    end
-  end
+describe port(80) do
+  it { should be_listening.on('127.0.0.1') }
+end
 
-  describe port('invalid') do
-    it { should_not be_listening }
+describe port(80) do
+  it do
+    expect{ should be_listening.on('') }.to raise_error(ArgumentError)
   end
+end
 
-  describe port(123) do
-    it { should be_listening.with("udp") }
-  end
+describe port(53) do
+  it { should be_listening.with('udp') }
 end
+

data/spec/type/base/service_spec.rb

@@ -6,29 +6,17 @@ describe service('sshd') do
   it { should be_running }
 end
 
-describe service('invalid-daemon') do
-  it { should_not be_running }
-end
-
 describe service('sshd') do
   let(:stdout) { "sshd is stopped\r\n" }
   it { should be_running }
 end
 
 describe service('sshd') do
-  it { should be_running.under('supervisor') }
-end
-
-describe service('invalid-daemon') do
-  it { should_not be_running.under('supervisor') }
+  it { should be_running.under(:supervisor) }
 end
 
 describe service('sshd') do
-  it { should be_running.under('upstart') }
-end
-
-describe service('invalid-daemon') do
-  it { should_not be_running.under('upstart') }
+  it { should be_running.under(:upstart) }
 end
 
 describe service('sshd') do
@@ -41,24 +29,11 @@ end
 
 describe service('sshd') do
   let(:stdout) { "Process 'sshd'\r\n  status running\r\n  monitoring status  monitored" }
-  it { should be_monitored_by('monit') }
-end
-
-describe service('sshd') do
-  let(:stdout) { "Process 'sshd'\r\n  status  not monitored\r\n  monitoring status  not monitored" }
-  it { should_not be_monitored_by('monit') }
-end
-
-describe service('invalid-daemon') do
-  it { should_not be_monitored_by('monit') }
+  it { should be_monitored_by(:monit) }
 end
 
 describe service('unicorn') do
-  it { should be_monitored_by('god') }
-end
-
-describe service('invalid-daemon') do
-  it { should_not be_monitored_by('god') }
+  it { should be_monitored_by(:god) }
 end
 
 describe service('sshd') do

data/spec/type/base/user_spec.rb

@@ -6,10 +6,6 @@ describe user('root') do
   it { should exist }
 end
 
-describe user('invalid-user') do
-  it { should_not exist }
-end
-
 describe user('root') do
   it { should belong_to_group 'root' }
 end
@@ -18,38 +14,18 @@ describe user('root') do
   it { should belong_to_primary_group 'root' }
 end
 
-describe user('root') do
-  it { should_not belong_to_group 'invalid-group' }
-end
-
 describe user('root') do
   it { should have_uid 0 }
 end
 
-describe user('root') do
-  it { should_not have_uid 'invalid-uid' }
-end
-
 describe user('root') do
   it { should have_login_shell '/bin/bash' }
 end
 
-describe user('root') do
-  it { should_not have_login_shell 'invalid-login-shell' }
-end
-
 describe user('root') do
   it { should have_home_directory '/root' }
 end
 
-describe user('root') do
-  it { should_not have_home_directory 'invalid-home-directory' }
-end
-
 describe user('root') do
   it { should have_authorized_key 'ssh-rsa ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGH foo@bar.local' }
 end
-
-describe user('root') do
-  it { should_not have_authorized_key 'invalid-key' }
-end

data/spec/type/darwin/package_spec.rb

@@ -6,18 +6,10 @@ describe package('httpd') do
   it { should be_installed }
 end
 
-describe package('invalid-package') do
-  it { should_not be_installed }
-end
-
 describe package('httpd') do
   it { should be_installed.with_version('2.2.15-28.el6') }
 end
 
-describe package('httpd') do
-  it { should_not be_installed.with_version('invalid-version') }
-end
-
 describe package('httpd') do
   it { should be_installed.by('homebrew') }
 end

data/spec/type/darwin/port_spec.rb

@@ -2,32 +2,26 @@ require 'spec_helper'
 
 set :os, :family => 'darwin'
 
-describe Serverspec::Type::Port do
-  describe port(80) do
-    it { should be_listening }
-
-    it('protocol: tcp') { should be_listening.with('tcp') }
-
-    it 'invalid protocol raises error' do
-      expect {
-        should be_listening.with('not implemented')
-      }.to raise_error(ArgumentError, %r/\A`be_listening` matcher doesn\'t support/)
-    end
+describe port(80) do
+  it { should be_listening }
+end
 
-    it('on: 127.0.0.1') do
-      should be_listening.on('127.0.0.1')
-    end
+describe port(80) do
+  it { should be_listening.with('tcp') }
+end
 
-    it 'invalid local address raises error' do
-      expect{ should be_listening.on('') }.to raise_error(ArgumentError)
-    end
+describe port(80) do
+  it  do
+    expect {
+      should be_listening.with('not implemented')
+    }.to raise_error(ArgumentError, %r/\A`be_listening` matcher doesn\'t support/)
   end
+end
 
-  describe port('invalid') do
-    it { should_not be_listening }
-  end
+describe port(80) do
+  it { should be_listening.on('127.0.0.1') }
+end
 
-  describe port(123) do
-    it { should be_listening.with("udp") }
-  end
+describe port(53) do
+  it { should be_listening.with('udp') }
 end

data/spec/type/darwin/service_spec.rb

@@ -6,23 +6,11 @@ describe service('sshd') do
   it { should be_enabled }
 end
 
-describe service('invalid-service') do
-  it { should_not be_enabled }
-end
-
 describe service('sshd') do
   it { should be_enabled.with_level(4) }
 end
 
-describe service('invalid-service') do
-  it { should_not be_enabled.with_level(4) }
-end
-
 describe service('sshd') do
   it { should be_running }
 end
 
-describe service('invalid-service') do
-  it { should_not be_running }
-end
-

data/spec/type/debian/package_spec.rb

@@ -6,14 +6,6 @@ describe package('httpd') do
   it { should be_installed }
 end
 
-describe package('invalid-package') do
-  it { should_not be_installed }
-end
-
-describe package('invalid-package') do
-  it { should_not be_installed.by('apt') }
-end
-
 describe package('httpd') do
   it { should be_installed.with_version('2.2.15-28.el6') }
 end
@@ -22,10 +14,6 @@ describe package('httpd') do
   it { should be_installed.by('apt').with_version('2.2.15-28.el6') }
 end
 
-describe package('httpd') do
-  it { should_not be_installed.with_version('invalid-version') }
-end
-
 describe package('httpd') do
   let(:stdout) { "2.2.15\n" }
   its(:version) { should eq '2.2.15' }

data/spec/type/debian/service_spec.rb

@@ -6,14 +6,6 @@ describe service('sshd') do
   it { should be_enabled }
 end
 
-describe service('invalid-service') do
-  it { should_not be_enabled }
-end
-
 describe service('sshd') do
   it { should be_enabled.with_level(4) }
 end
-
-describe service('invalid-service') do
-  it { should_not be_enabled.with_level(4) }
-end

data/spec/type/freebsd/file_spec.rb

@@ -6,34 +6,18 @@ describe file('/etc/passwd') do
   it { should be_mode 644 }
 end
 
-describe file('/etc/passwd') do
-  it { should_not be_mode 'invalid' }
-end
-
 describe file('/etc/passwd') do
   it { should be_owned_by 'root' }
 end
 
-describe file('/etc/passwd') do
-  it { should_not be_owned_by 'invalid-owner' }
-end
-
 describe file('/etc/passwd') do
   it { should be_grouped_into 'root' }
 end
 
-describe file('/etc/passwd') do
-  it { should_not be_grouped_into 'invalid-group' }
-end
-
 describe file('/sbin/nologin') do
   it { should be_linked_to '/usr/sbin/nologin' }
 end
 
-describe file('dummy-link') do
-  it { should_not be_linked_to '/invalid/target' }
-end
-
 describe file('/etc/passwd') do
   let(:stdout) { Time.now.to_i.to_s }
   its(:mtime) { should > DateTime.now - 1 }

data/spec/type/freebsd/package_spec.rb

@@ -6,18 +6,10 @@ describe package('httpd') do
   it { should be_installed }
 end
 
-describe package('invalid-package') do
-  it { should_not be_installed }
-end
-
 describe package('httpd') do
   it { should be_installed.with_version('2.2.15-28.el6') }
 end
 
-describe package('httpd') do
-  it { should_not be_installed.with_version('invalid-version') }
-end
-
 describe package('httpd') do
   let(:stdout) { "2.2.15\n" }
   its(:version) { should eq '2.2.15' }

data/spec/type/freebsd/port_spec.rb

@@ -2,32 +2,26 @@ require 'spec_helper'
 
 set :os, :family => 'freebsd'
 
-describe Serverspec::Type::Port do
-  describe port(80) do
-    it { should be_listening }
-
-    it('protocol: tcp') { should be_listening.with('tcp') }
-
-    it 'invalid protocol raises error' do
-      expect {
-        should be_listening.with('not implemented')
-      }.to raise_error(ArgumentError, %r/\A`be_listening` matcher doesn\'t support/)
-    end
+describe port(80) do
+  it { should be_listening }
+end
 
-    it('on: 127.0.0.1') do
-      should be_listening.on('127.0.0.1')
-    end
+describe port(80) do
+  it { should be_listening.with('tcp') }
+end
 
-    it 'invalid local address raises error' do
-      expect{ should be_listening.on('') }.to raise_error(ArgumentError)
-    end
+describe port(80) do
+  it  do
+    expect {
+      should be_listening.with('not implemented')
+    }.to raise_error(ArgumentError, %r/\A`be_listening` matcher doesn\'t support/)
   end
+end
 
-  describe port('invalid') do
-    it { should_not be_listening }
-  end
+describe port(80) do
+  it { should be_listening.on('127.0.0.1') }
+end
 
-  describe port(123) do
-    it { should be_listening.with("udp") }
-  end
+describe port(53) do
+  it { should be_listening.with('udp') }
 end

data/spec/type/freebsd/service_spec.rb

@@ -6,7 +6,3 @@ describe service('sshd') do
   it { should be_enabled }
 end
 
-describe service('invalid-service') do
-  it { should_not be_enabled }
-end
-

data/spec/type/freebsd10/package_spec.rb

@@ -6,18 +6,10 @@ describe package('httpd') do
   it { should be_installed }
 end
 
-describe package('invalid-package') do
-  it { should_not be_installed }
-end
-
 describe package('httpd') do
   it { should be_installed.with_version('2.2.15-28.el6') }
 end
 
-describe package('httpd') do
-  it { should_not be_installed.with_version('invalid-version') }
-end
-
 describe package('httpd') do
   let(:stdout) { "2.2.15\n" }
   its(:version) { should eq '2.2.15' }

data/spec/type/gentoo/package_spec.rb

@@ -5,8 +5,3 @@ set :os, :family => 'gentoo'
 describe package('httpd') do
   it { should be_installed }
 end
-
-describe package('invalid-package') do
-  it { should_not be_installed }
-end
-

data/spec/type/gentoo/service_spec.rb

@@ -6,15 +6,7 @@ describe service('sshd') do
   it { should be_enabled }
 end
 
-describe service('invalid-service') do
-  it { should_not be_enabled }
-end
-
 describe service('sshd') do
   it { should be_running }
 end
 
-describe service('invalid-service') do
-  it { should_not be_running }
-end
-

data/spec/type/linux/file_spec.rb

@@ -8,27 +8,14 @@ describe file('/tmp') do
   it { should be_readable.by_user('mail') }
 end
 
-describe file('/tmp') do
-  it { should_not be_readable.by_user('invalid-user') }
-end
-
 describe file('/tmp') do
   it { should be_writable.by_user('mail') }
 end
 
-describe file('/tmp') do
-  it { should_not be_writable.by_user('invalid-user') }
-end
-
-
 describe file('/tmp') do
   it { should be_executable.by_user('mail') }
 end
 
-describe file('/tmp') do
-  it { should_not be_executable.by_user('invalid-user') }
-end
-
 describe file('/tmp') do
   it { should be_immutable }
 end

data/spec/type/linux/iptables_spec.rb

@@ -6,14 +6,6 @@ describe iptables do
   it { should have_rule '-P INPUT ACCEPT' }
 end
 
-describe iptables do
-  it { should_not have_rule 'invalid-rule' }
-end
-
 describe iptables do
   it { should have_rule('-P INPUT ACCEPT').with_table('mangle').with_chain('INPUT') }
 end
-
-describe iptables do
-  it { should_not have_rule('invalid-rule').with_table('mangle').with_chain('INPUT') }
-end

data/spec/type/linux/kernel_module_spec.rb

@@ -5,7 +5,3 @@ set :os, :family => 'linux'
 describe kernel_module('lp') do
   it { should be_loaded }
 end
-
-describe kernel_module('invalid-module') do
-  it { should_not be_loaded }
-end

data/spec/type/linux/lxc_container_spec.rb

@@ -6,15 +6,7 @@ describe lxc('ct01') do
   it { should exist }
 end
 
-describe lxc('invalid-ct') do
-  it { should_not exist }
-end
-
 describe lxc('ct01') do
   it { should be_running }
 end
 
-describe lxc('invalid-ct') do
-  it { should_not be_running }
-end
-

data/spec/type/nixos/package_spec.rb

@@ -6,14 +6,6 @@ describe package('httpd') do
   it { should be_installed }
 end
 
-describe package('invalid-package') do
-  it { should_not be_installed }
-end
-
-describe package('invalid-package') do
-  it { should_not be_installed.by('nix') }
-end
-
 describe package('httpd') do
   it { should be_installed.with_version('2.2.15-28.el6') }
 end
@@ -21,7 +13,3 @@ end
 describe package('httpd') do
   it { should be_installed.by('nix').with_version('2.2.15-28.el6') }
 end
-
-describe package('httpd') do
-  it { should_not be_installed.with_version('invalid-version') }
-end

data/spec/type/openbsd/file_spec.rb

@@ -6,42 +6,22 @@ describe file('/etc/passwd') do
   it { should be_mode 644 }
 end
 
-describe file('/etc/passwd') do
-  it { should_not be_mode 'invalid' }
-end
-
 describe file('/etc/passwd') do
   it { should be_owned_by 'root' }
 end
 
-describe file('/etc/passwd') do
-  it { should_not be_owned_by 'invalid-owner' }
-end
-
 describe file('/etc/passwd') do
   it { should be_grouped_into 'root' }
 end
 
-describe file('/etc/passwd') do
-  it { should_not be_grouped_into 'invalid-group' }
-end
-
 describe file('/etc/pam.d/system-auth') do
   it { should be_linked_to '/etc/pam.d/system-auth-ac' }
 end
 
-describe file('dummy-link') do
-  it { should_not be_linked_to '/invalid/target' }
-end
-
 describe file('/') do
   it { should be_mounted }
 end
 
-describe file('/etc/invalid-mount') do
-  it { should_not be_mounted }
-end
-
 describe file('/') do
   let(:stdout) { "/dev/mapper/VolGroup-lv_root on / type ext4 (rw,mode=620)\r\n" }
   it { should be_mounted.with( :type => 'ext4' ) }
@@ -87,11 +67,6 @@ describe file('/') do
   it { should_not be_mounted.with( :type => 'ext4', :device => '/dev/mapper/VolGroup-lv_r00t' ) }
 end
 
-describe file('/etc/invalid-mount') do
-  let(:stdout) { "/dev/mapper/VolGroup-lv_root on / type ext4 (rw,mode=620)\r\n" }
-  it { should_not be_mounted.with( :type => 'ext4' ) }
-end
-
 describe file('/') do
   let(:stdout) { "/dev/mapper/VolGroup-lv_root on / type ext4 (rw,mode=620)\r\n" }
   it do
@@ -148,11 +123,6 @@ describe file('/') do
   end
 end
 
-describe file('/etc/invalid-mount') do
-  let(:stdout) { "/dev/mapper/VolGroup-lv_root on / type ext4 (rw,mode=620)\r\n" }
-  it { should_not be_mounted.only_with( :type => 'ext4' ) }
-end
-
 describe file('/etc/services') do
   let(:stdout) { "35435ea447c19f0ea5ef971837ab9ced\n" }
   its(:md5sum) { should eq '35435ea447c19f0ea5ef971837ab9ced' }

data/spec/type/openbsd/mail_alias_spec.rb

@@ -5,7 +5,3 @@ set :os, :family => 'openbsd'
 describe mail_alias('daemon') do
   it { should be_aliased_to "root" }
 end
-
-describe mail_alias('invalid-recipient') do
-  it { should_not be_aliased_to "foo" }
-end

data/spec/type/openbsd/package_spec.rb

@@ -6,15 +6,6 @@ describe package('httpd') do
   it { should be_installed }
 end
 
-describe package('invalid-package') do
-  it { should_not be_installed }
-end
-
 describe package('httpd') do
   it { should be_installed.with_version('2.2.15-28.el6') }
 end
-
-describe package('httpd') do
-  it { should_not be_installed.with_version('invalid-version') }
-end
-

data/spec/type/openbsd/service_spec.rb

@@ -6,15 +6,8 @@ describe service('sshd') do
   it { should be_enabled }
 end
 
-describe service('invalid-service') do
-  it { should_not be_enabled }
-end
-
 describe service('sshd') do
   it { should be_running }
 end
 
-describe service('invalid-service') do
-  it { should_not be_running }
-end
 

data/spec/type/openbsd/user_spec.rb

@@ -6,15 +6,7 @@ describe user('root') do
   it { should have_login_shell '/bin/bash' }
 end
 
-describe user('root') do
-  it { should_not have_login_shell 'invalid-login-shell' }
-end
-
 describe user('root') do
   it { should have_home_directory '/root' }
 end
 
-describe user('root') do
-  it { should_not have_home_directory 'invalid-home-directory' }
-end
-