serverspec 2.0.0.beta19 → 2.0.0.beta20

data/spec/type/opensuse/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/plamo/package_spec.rb

@@ -6,7 +6,3 @@ describe package('httpd') do
   it { should be_installed }
 end
 
-describe package('invalid-package') do
-  it { should_not be_installed }
-end
-

data/spec/type/plamo/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/redhat/file_spec.rb

@@ -6,27 +6,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/redhat/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('rpm') }
-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('rpm').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/redhat/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/redhat/yumrepo_spec.rb

@@ -2,24 +2,10 @@ require 'spec_helper'
 
 set :os, :family => 'redhat'
 
-describe 'Serverspec yumrepo matchers of Red Hat family' do
-  describe 'exist' do
-    describe yumrepo('epel') do
-      it { should exist }
-    end
-
-    describe yumrepo('invalid-repository') do
-      it { should_not exist }
-    end
-  end
-
-  describe 'be_enabled' do
-    describe yumrepo('epel') do
-      it { should be_enabled }
-    end
+describe yumrepo('epel') do
+  it { should exist }
+end
 
-    describe yumrepo('invalid-repository') do
-      it { should_not be_enabled }
-    end
-  end
+describe yumrepo('epel') do
+  it { should be_enabled }
 end

data/spec/type/redhat5/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/smartos/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/smartos/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_running }
 end
 
-describe service('invalid-service') do
-  it { should_not be_running }
-end
-
 describe service('sshd') do
   it { should have_property :foo => 'bar' }
 end
 
-describe service('invalid-service') do
-  it { should_not have_property :foo => 'bar' }
-end
-

data/spec/type/solaris/cron_spec.rb

@@ -6,14 +6,6 @@ describe cron do
   it { should have_entry '* * * * * /usr/local/bin/batch.sh' }
 end
 
-describe cron do
-  it { should_not have_entry 'invalid entry' }
-end
-
 describe cron do
   it { should have_entry('* * * * * /usr/local/bin/batch.sh').with_user('root') }
 end
-
-describe cron do
-  it { should_not have_entry('* * * * * /usr/local/bin/batch.sh').with_user('invalid-user') }
-end

data/spec/type/solaris/file_spec.rb

@@ -6,24 +6,10 @@ 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
-

data/spec/type/solaris/group_spec.rb

@@ -5,7 +5,3 @@ set :os, :family => 'solaris'
 describe group('root') do
   it { should have_gid 0 }
 end
-
-describe group('root') do
-  it { should_not have_gid 'invalid-gid' }
-end

data/spec/type/solaris/host_spec.rb

@@ -6,22 +6,14 @@ describe host('127.0.0.1') do
   it { should be_reachable }
 end
 
-describe host('invalid-host') do
-  it { should_not be_reachable }
-end
-
 describe host('127.0.0.1') do
-  it { should be_reachable.with(:proto => "icmp", :timeout=> 1) }
+  it { should be_reachable.with(:proto => 'icmp', :timeout=> 1) }
 end
 
 describe host('127.0.0.1') do
-  it { should be_reachable.with(:proto => "tcp", :port => 22, :timeout=> 1) }
+  it { should be_reachable.with(:proto => 'tcp', :port => 22, :timeout=> 1) }
 end
 
 describe host('127.0.0.1') do
-  it { should be_reachable.with(:proto => "udp", :port => 53, :timeout=> 1) }
-end
-
-describe host('invalid-host') do
-  it { should_not be_reachable.with(:proto => "udp", :port => 53, :timeout=> 1) }
+  it { should be_reachable.with(:proto => 'udp', :port => 53, :timeout=> 1) }
 end

data/spec/type/solaris/package_spec.rb

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

data/spec/type/solaris/port_spec.rb

@@ -2,32 +2,33 @@ require 'spec_helper'
 
 set :os, :family => 'solaris'
 
-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") }
+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
+

data/spec/type/solaris/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_running }
 end
 
-describe service('invalid-service') do
-  it { should_not be_running }
-end
-
 describe service('sshd') do
   it { should have_property :foo => 'bar' }
 end
 
-describe service('invalid-service') do
-  it { should_not have_property :foo => 'bar' }
-end
-

data/spec/type/solaris/user_spec.rb

@@ -6,23 +6,11 @@ describe user('root') do
   it { should belong_to_group 'root' }
 end
 
-describe user('root') do
-  it { should_not belong_to_group 'invalid-group' }
-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
-

data/spec/type/solaris10/file_spec.rb

@@ -6,26 +6,14 @@ describe file('/etc/ssh/sshd_config') do
   it { should be_file }
 end
 
-describe file('/etc/invalid_file') do
-  it { should_not be_file }
-end
-
 describe file('/etc/ssh') do
   it { should be_directory }
 end
 
-describe file('/etc/invalid_directory') do
-  it { should_not be_directory }
-end
-
 describe file('/var/run/unicorn.sock') do
   it { should be_socket }
 end
 
-describe file('/etc/invalid_socket') do
-  it { should_not be_socket }
-end
-
 describe file('/etc/ssh/sshd_config') do
   it { should contain 'This is the sshd server system-wide configuration file' }
 end
@@ -34,66 +22,34 @@ describe file('/etc/ssh/sshd_config') do
   it { should contain /^This is the sshd server system-wide configuration file/ }
 end
 
-describe file('/etc/ssh/sshd_config') do
-  it { should_not contain 'This is invalid text!!' }
-end
-
 describe file('Gemfile') do
   it { should contain('rspec').from(/^group :test do/).to(/^end/) }
 end
 
-describe file('/etc/ssh/sshd_config') do
-  it { should_not contain('This is invalid text!!').from(/^group :test do/).to(/^end/) }
-end
-
 describe file('Gemfile') do
   it { should contain('rspec').after(/^group :test do/) }
 end
 
-describe file('/etc/ssh/sshd_config') do
-  it { should_not contain('This is invalid text!!').after(/^group :test do/) }
-end
-
 describe file('Gemfile') do
   it { should contain('rspec').before(/^end/) }
 end
 
-describe file('/etc/ssh/sshd_config') do
-  it { should_not contain('This is invalid text!!').before(/^end/) }
-end
-
 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('/dev') do
   let(:stdout) { "755\r\n" }
   it { should be_readable }
@@ -219,10 +175,6 @@ 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' ) }
@@ -268,11 +220,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
@@ -329,11 +276,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/solaris10/group_spec.rb

@@ -6,7 +6,3 @@ describe group('root') do
   it { should exist }
 end
 
-describe group('invalid-group') do
-  it { should_not exist }
-end
-

data/spec/type/solaris10/host_spec.rb

@@ -6,15 +6,11 @@ describe host('127.0.0.1') do
   it { should be_reachable }
 end
 
-describe host('invalid-host') do
-  it { should_not be_reachable }
-end
-
 describe host('127.0.0.1') do
-  it { should be_reachable.with(:proto => "icmp", :timeout=> 1) }
+  it { should be_reachable.with(:proto => 'icmp', :timeout=> 1) }
 end
 
 describe host('127.0.0.1') do
-  it { should be_reachable.with(:proto => "tcp", :port => 22, :timeout=> 1) }
+  it { should be_reachable.with(:proto => 'tcp', :port => 22, :timeout=> 1) }
 end
 

data/spec/type/solaris10/package_spec.rb

@@ -6,6 +6,3 @@ describe package('httpd') do
   it { should be_installed }
 end
 
-describe package('invalid-package') do
-  it { should_not be_installed }
-end

data/spec/type/solaris10/user_spec.rb

@@ -6,7 +6,3 @@ describe user('root') do
   it { should have_authorized_key 'XXXXXXXXXXXXXXX' }
 end
 
-describe user('root') do
-  it { should_not have_authorized_key 'invalid-key' }
-end
-

data/spec/type/suse/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('rpm') }
-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('rpm').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/suse/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/ubuntu/ppa_spec.rb

@@ -6,14 +6,6 @@ describe ppa('username/ppa-name') do
   it { should exist }
 end
 
-describe ppa('invalid-ppa') do
-  it { should_not exist }
-end
-
 describe ppa('username/ppa-name') do
   it { should be_enabled }
 end
-
-describe ppa('invalid-ppa') do
-  it { should_not be_enabled }
-end

data/spec/type/ubuntu/service_spec.rb

@@ -5,7 +5,3 @@ set :os, :family => 'ubuntu'
 describe service('sshd') do
   it { should be_running }
 end
-
-describe service('invalid-service') do
-  it { should_not be_running }
-end

data/spec/type/windows/feature_spec.rb

@@ -7,3 +7,11 @@ set :os, :family => 'windows'
 describe windows_feature('Minesweeper') do
   it{ should be_installed }
 end
+
+describe windows_feature('IIS-Webserver') do
+  it{ should be_installed.by(:dism) }
+end
+
+describe windows_feature('Web-Webserver') do
+  it{ should be_installed.by(:powershell) }
+end