chefspec 5.4.0 → 6.0.0

data/examples/smartos_package/spec/install_spec.rb

@@ -3,7 +3,7 @@ require 'chefspec'
 describe 'smartos_package::install' do
   let(:chef_run) do
     ChefSpec::ServerRunner.new(platform: 'smartos', version: '5.11')
-                        .converge(described_recipe)
+                          .converge(described_recipe)
   end
 
   it 'installs a smartos_package with the default action' do

data/examples/smartos_package/spec/remove_spec.rb

@@ -3,7 +3,7 @@ require 'chefspec'
 describe 'smartos_package::remove' do
   let(:chef_run) do
     ChefSpec::ServerRunner.new(platform: 'smartos', version: '5.11')
-                        .converge(described_recipe)
+                          .converge(described_recipe)
   end
 
   it 'removes a smartos_package with an explicit action' do

data/examples/smartos_package/spec/upgrade_spec.rb

@@ -3,7 +3,7 @@ require 'chefspec'
 describe 'smartos_package::upgrade' do
   let(:chef_run) do
     ChefSpec::ServerRunner.new(platform: 'smartos', version: '5.11')
-                        .converge(described_recipe)
+                          .converge(described_recipe)
   end
 
   it 'upgrades a smartos_package with an explicit action' do

data/examples/solaris_package/spec/install_spec.rb

@@ -3,7 +3,7 @@ require 'chefspec'
 describe 'solaris_package::install' do
   let(:chef_run) do
     ChefSpec::ServerRunner.new(platform: 'solaris2', version: '5.11')
-                        .converge(described_recipe)
+                          .converge(described_recipe)
   end
 
   it 'installs a solaris_package with the default action' do

data/examples/solaris_package/spec/remove_spec.rb

@@ -3,7 +3,7 @@ require 'chefspec'
 describe 'solaris_package::remove' do
   let(:chef_run) do
     ChefSpec::ServerRunner.new(platform: 'solaris2', version: '5.11')
-                        .converge(described_recipe)
+                          .converge(described_recipe)
   end
 
   it 'removes a solaris_package with an explicit action' do

data/examples/step_into/spec/default_spec.rb

@@ -15,8 +15,8 @@ describe 'step_into::default' do
 
   context 'with :step_into' do
     let(:chef_run) do
-      ChefSpec::ServerRunner.new(step_into: %w(step_into_lwrp provides_this))
-                          .converge(described_recipe)
+      ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04', step_into: %w(step_into_lwrp provides_this))
+                            .converge(described_recipe)
     end
 
     it 'executes the LWRPs action' do

data/examples/use_inline_resources/spec/default_spec.rb

@@ -3,7 +3,7 @@ require 'chefspec'
 describe 'use_inline_resources::default' do
   let(:chef_run) do
     ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04', step_into: ['use_inline_resources_lwrp'])
-                        .converge(described_recipe)
+                          .converge(described_recipe)
   end
 
   it 'uses the LWRP' do

data/examples/windows_package/spec/install_spec.rb

@@ -3,7 +3,7 @@ require 'chefspec'
 describe 'windows_package::install' do
   let(:chef_run) do
     ChefSpec::ServerRunner.new(platform: 'windows', version: '2012R2')
-                        .converge(described_recipe)
+                          .converge(described_recipe)
   end
 
   it 'installs a windows_package with an explicit action' do

data/examples/windows_package/spec/remove_spec.rb

@@ -3,7 +3,7 @@ require 'chefspec'
 describe 'windows_package::remove' do
   let(:chef_run) do
     ChefSpec::ServerRunner.new(platform: 'windows', version: '2012R2')
-                        .converge(described_recipe)
+                          .converge(described_recipe)
   end
 
   it 'removes a windows_package with an explicit action' do

data/examples/windows_service/spec/configure_startup_spec.rb

@@ -3,7 +3,7 @@ require 'chefspec'
 describe 'windows_service::configure_startup' do
   let(:chef_run) do
     ChefSpec::ServerRunner.new(platform: 'windows', version: '2012R2')
-                        .converge(described_recipe)
+                          .converge(described_recipe)
   end
 
   it 'configures startup for a windows_service with an explicit action' do

data/examples/windows_service/spec/disable_spec.rb

@@ -3,7 +3,7 @@ require 'chefspec'
 describe 'windows_service::disable' do
   let(:chef_run) do
     ChefSpec::ServerRunner.new(platform: 'windows', version: '2012R2')
-                        .converge(described_recipe)
+                          .converge(described_recipe)
   end
 
   it 'disables a windows_service with an explicit action' do

data/examples/windows_service/spec/enable_spec.rb

@@ -3,7 +3,7 @@ require 'chefspec'
 describe 'windows_service::enable' do
   let(:chef_run) do
     ChefSpec::ServerRunner.new(platform: 'windows', version: '2012R2')
-                        .converge(described_recipe)
+                          .converge(described_recipe)
   end
 
   it 'enables a windows_service with an explicit action' do

data/examples/windows_service/spec/reload_spec.rb

@@ -3,7 +3,7 @@ require 'chefspec'
 describe 'windows_service::reload' do
   let(:chef_run) do
     ChefSpec::ServerRunner.new(platform: 'windows', version: '2012R2')
-                        .converge(described_recipe)
+                          .converge(described_recipe)
   end
 
   it 'reloads a windows_service with an explicit action' do

data/examples/windows_service/spec/restart_spec.rb

@@ -3,7 +3,7 @@ require 'chefspec'
 describe 'windows_service::restart' do
   let(:chef_run) do
     ChefSpec::ServerRunner.new(platform: 'windows', version: '2012R2')
-                        .converge(described_recipe)
+                          .converge(described_recipe)
   end
 
   it 'restarts a windows_service with an explicit action' do

data/examples/windows_service/spec/start_spec.rb

@@ -3,7 +3,7 @@ require 'chefspec'
 describe 'windows_service::start' do
   let(:chef_run) do
     ChefSpec::ServerRunner.new(platform: 'windows', version: '2012R2')
-                        .converge(described_recipe)
+                          .converge(described_recipe)
   end
 
   it 'starts a windows_service with an explicit action' do

data/examples/windows_service/spec/stop_spec.rb

@@ -3,7 +3,7 @@ require 'chefspec'
 describe 'windows_service::stop' do
   let(:chef_run) do
     ChefSpec::ServerRunner.new(platform: 'windows', version: '2012R2')
-                        .converge(described_recipe)
+                          .converge(described_recipe)
   end
 
   it 'stops a windows_service with an explicit action' do

data/examples/yum_package/spec/install_spec.rb

@@ -3,7 +3,7 @@ require 'chefspec'
 describe 'yum_package::install' do
   let(:chef_run) do
     ChefSpec::ServerRunner.new(platform: 'centos', version: '7.2.1511')
-                        .converge(described_recipe)
+                          .converge(described_recipe)
   end
 
   it 'installs a yum_package with the default action' do

data/examples/yum_package/spec/purge_spec.rb

@@ -3,7 +3,7 @@ require 'chefspec'
 describe 'yum_package::purge' do
   let(:chef_run) do
     ChefSpec::ServerRunner.new(platform: 'centos', version: '7.2.1511')
-                        .converge(described_recipe)
+                          .converge(described_recipe)
   end
 
   it 'purges a yum_package with an explicit action' do

data/examples/yum_package/spec/remove_spec.rb

@@ -3,7 +3,7 @@ require 'chefspec'
 describe 'yum_package::remove' do
   let(:chef_run) do
     ChefSpec::ServerRunner.new(platform: 'centos', version: '7.2.1511')
-                        .converge(described_recipe)
+                          .converge(described_recipe)
   end
 
   it 'removes a yum_package with an explicit action' do

data/examples/yum_package/spec/upgrade_spec.rb

@@ -3,7 +3,7 @@ require 'chefspec'
 describe 'yum_package::upgrade' do
   let(:chef_run) do
     ChefSpec::ServerRunner.new(platform: 'centos', version: '7.2.1511')
-                        .converge(described_recipe)
+                          .converge(described_recipe)
   end
 
   it 'upgrades a yum_package with an explicit action' do

data/examples/yum_repository/spec/add_spec.rb

@@ -3,7 +3,7 @@ require 'chefspec'
 describe 'yum_repository::add' do
   let(:chef_run) do
     ChefSpec::ServerRunner.new(platform: 'centos', version: '7.2.1511')
-                        .converge(described_recipe)
+                          .converge(described_recipe)
   end
 
   it 'creates a yum_repository with add action' do

data/examples/yum_repository/spec/create_spec.rb

@@ -3,7 +3,7 @@ require 'chefspec'
 describe 'yum_repository::create' do
   let(:chef_run) do
     ChefSpec::ServerRunner.new(platform: 'centos', version: '7.2.1511')
-                        .converge(described_recipe)
+                          .converge(described_recipe)
   end
 
   it 'create a yum_repository with default action' do

data/examples/yum_repository/spec/delete_spec.rb

@@ -3,7 +3,7 @@ require 'chefspec'
 describe 'yum_repository::delete' do
   let(:chef_run) do
     ChefSpec::ServerRunner.new(platform: 'centos', version: '7.2.1511')
-                        .converge(described_recipe)
+                          .converge(described_recipe)
   end
 
   it 'removes a yum_repository with delete action' do

data/examples/yum_repository/spec/makecache_spec.rb

@@ -3,7 +3,7 @@ require 'chefspec'
 describe 'yum_repository::makecache' do
   let(:chef_run) do
     ChefSpec::ServerRunner.new(platform: 'centos', version: '7.2.1511')
-                        .converge(described_recipe)
+                          .converge(described_recipe)
   end
 
   it 'makes cache for a yum_repository' do

data/examples/yum_repository/spec/remove_spec.rb

@@ -3,7 +3,7 @@ require 'chefspec'
 describe 'yum_repository::remove' do
   let(:chef_run) do
     ChefSpec::ServerRunner.new(platform: 'centos', version: '7.2.1511')
-                        .converge(described_recipe)
+                          .converge(described_recipe)
   end
 
   it 'removes a yum_repository with remove action' do

data/features/cab_package.feature

@@ -0,0 +1,21 @@
+@not_chef_12_6_0
+@not_chef_12_7_2
+@not_chef_12_8_1
+@not_chef_12_9_41
+@not_chef_12_10_24
+@not_chef_12_11_18
+@not_chef_12_12_15
+@not_chef_12_13_37
+@not_chef_12_14_89
+
+Feature: The cab_package matcher
+  Background:
+    * I am using the "cab_package" cookbook
+
+  Scenario Outline: Running specs
+    * I successfully run `rspec spec/<Matcher>_spec.rb`
+    * the output should contain "0 failures"
+  Examples:
+    | Matcher  |
+    | install  |
+    | remove   |

data/features/dnf_package.feature

@@ -0,0 +1,26 @@
+@not_chef_12_6_0
+@not_chef_12_7_2
+@not_chef_12_8_1
+@not_chef_12_9_41
+@not_chef_12_10_24
+@not_chef_12_11_18
+@not_chef_12_12_15
+@not_chef_12_13_37
+@not_chef_12_14_89
+@not_chef_12_15_19
+@not_chef_12_16_42
+@not_chef_12_17_44
+
+Feature: The dnf_package matcher
+  Background:
+    * I am using the "dnf_package" cookbook
+
+  Scenario Outline: Running specs
+    * I successfully run `rspec spec/<Matcher>_spec.rb`
+    * the output should contain "0 failures"
+  Examples:
+    | Matcher     |
+    | install     |
+    | purge       |
+    | remove      |
+    | upgrade     |

data/features/msu_package.feature

@@ -0,0 +1,23 @@
+@not_chef_12_6_0
+@not_chef_12_7_2
+@not_chef_12_8_1
+@not_chef_12_9_41
+@not_chef_12_10_24
+@not_chef_12_11_18
+@not_chef_12_12_15
+@not_chef_12_13_37
+@not_chef_12_14_89
+@not_chef_12_15_19
+@not_chef_12_16_42
+
+Feature: The msu_package matcher
+  Background:
+    * I am using the "msu_package" cookbook
+
+  Scenario Outline: Running specs
+    * I successfully run `rspec spec/<Matcher>_spec.rb`
+    * the output should contain "0 failures"
+  Examples:
+    | Matcher  |
+    | install  |
+    | remove   |

data/features/support/env.rb

@@ -20,6 +20,14 @@ Before do
   # RSpec::Runner) removes our configurations :(
   load 'lib/chefspec/rspec.rb'
 
+  # These settings need to be specified manually here rather than in rspec.rb
+  # because we do not want the zero-server terminating between each run. The
+  # runs happen too quickly in succession the port doesn't have time to get reset.
+  RSpec.configure do |config|
+    config.before(:suite) { ChefSpec::ZeroServer.setup! }
+    config.after(:each) { ChefSpec::ZeroServer.reset! }
+  end
+
   # Use a temporary directory to suppress Travis warnings
   @dirs = [Dir.mktmpdir]
 end

data/lib/chefspec.rb

@@ -80,4 +80,3 @@ require_relative 'chefspec/util'
 require_relative 'chefspec/version'
 
 require_relative 'chefspec/deprecations'
-require_relative 'chefspec/chef_backwards_compat' if Chef::VERSION.to_f < 12.0

data/lib/chefspec/api.rb

@@ -29,12 +29,14 @@ require_relative 'api/apt_update'
 require_relative 'api/apt_repository'
 require_relative 'api/bff_package'
 require_relative 'api/batch'
+require_relative 'api/cab_package'
 require_relative 'api/chef_gem'
 require_relative 'api/chocolatey_package'
 require_relative 'api/cookbook_file'
 require_relative 'api/cron'
 require_relative 'api/deploy'
 require_relative 'api/directory'
+require_relative 'api/dnf_package'
 require_relative 'api/dpkg_package'
 require_relative 'api/do_nothing'
 require_relative 'api/dsc_resource'
@@ -59,6 +61,7 @@ require_relative 'api/log'
 require_relative 'api/macports_package'
 require_relative 'api/mdadm'
 require_relative 'api/mount'
+require_relative 'api/msu_package'
 require_relative 'api/notifications'
 require_relative 'api/ohai'
 require_relative 'api/openbsd_package'

data/lib/chefspec/api/cab_package.rb

@@ -0,0 +1,80 @@
+module ChefSpec::API
+  # @since 6.0.0
+  module CabPackageMatchers
+    ChefSpec.define_matcher :cab_package
+
+    #
+    # Assert that a +cab_package+ resource exists in the Chef run with the
+    # action +:install+. Given a Chef Recipe that installs "apache2" as a
+    # +cab_package+:
+    #
+    #     cab_package 'apache2' do
+    #       action :install
+    #     end
+    #
+    # The Examples section demonstrates the different ways to test a
+    # +cab_package+ resource with ChefSpec.
+    #
+    # @example Assert that a +cab_package+ was installed
+    #   expect(chef_run).to install_cab_package('apache2')
+    #
+    # @example Assert that a +cab_package+ was installed with predicate matchers
+    #   expect(chef_run).to install_cab_package('apache2').with_version('1.2.3')
+    #
+    # @example Assert that a +cab_package+ was installed with attributes
+    #   expect(chef_run).to install_cab_package('apache2').with(version: '1.2.3')
+    #
+    # @example Assert that a +cab_package+ was installed using a regex
+    #   expect(chef_run).to install_cab_package('apache2').with(version: /(\d+\.){2}\.\d+/)
+    #
+    # @example Assert that a +cab_package+ was _not_ installed
+    #   expect(chef_run).to_not install_cab_package('apache2')
+    #
+    #
+    # @param [String, Regex] resource_name
+    #   the name of the resource to match
+    #
+    # @return [ChefSpec::Matchers::ResourceMatcher]
+    #
+    def install_cab_package(resource_name)
+      ChefSpec::Matchers::ResourceMatcher.new(:cab_package, :install, resource_name)
+    end
+
+    #
+    # Assert that a +cab_package+ resource exists in the Chef run with the
+    # action +:remove+. Given a Chef Recipe that removes "apache2" as a
+    # +cab_package+:
+    #
+    #     cab_package 'apache2' do
+    #       action :remove
+    #     end
+    #
+    # The Examples section demonstrates the different ways to test a
+    # +cab_package+ resource with ChefSpec.
+    #
+    # @example Assert that a +cab_package+ was removed
+    #   expect(chef_run).to remove_cab_package('apache2')
+    #
+    # @example Assert that a +cab_package+ was removed with predicate matchers
+    #   expect(chef_run).to remove_cab_package('apache2').with_version('1.2.3')
+    #
+    # @example Assert that a +cab_package+ was removed with attributes
+    #   expect(chef_run).to remove_cab_package('apache2').with(version: '1.2.3')
+    #
+    # @example Assert that a +cab_package+ was removed using a regex
+    #   expect(chef_run).to remove_cab_package('apache2').with(version: /(\d+\.){2}\.\d+/)
+    #
+    # @example Assert that a +cab_package+ was _not_ removed
+    #   expect(chef_run).to_not remove_cab_package('apache2')
+    #
+    #
+    # @param [String, Regex] resource_name
+    #   the name of the resource to match
+    #
+    # @return [ChefSpec::Matchers::ResourceMatcher]
+    #
+    def remove_cab_package(resource_name)
+      ChefSpec::Matchers::ResourceMatcher.new(:cab_package, :remove, resource_name)
+    end
+  end
+end