From 57fa256c4e2d394719848233921b58725acf2432 Mon Sep 17 00:00:00 2001 From: William Yardley Date: Thu, 7 Sep 2017 17:43:19 -0700 Subject: [PATCH] Update 'require' statements and mock types to fix spec tests --- .../puppet/provider/rabbitmq_binding/rabbitmqadmin_spec.rb | 7 ++----- .../provider/rabbitmq_exchange/rabbitmqadmin_spec.rb | 7 ++----- .../puppet/provider/rabbitmq_parameter/rabbitmqctl_spec.rb | 7 +------ .../puppet/provider/rabbitmq_plugin/rabbitmqctl_spec.rb | 7 ++----- .../puppet/provider/rabbitmq_policy/rabbitmqctl_spec.rb | 7 +------ .../puppet/provider/rabbitmq_queue/rabbitmqadmin_spec.rb | 7 ++----- .../unit/puppet/provider/rabbitmq_user/rabbitmqctl_spec.rb | 7 ++----- .../provider/rabbitmq_user_permissions/rabbitmqctl_spec.rb | 7 ++----- .../puppet/provider/rabbitmq_vhost/rabbitmqctl_spec.rb | 7 ++----- 9 files changed, 16 insertions(+), 47 deletions(-) diff --git a/spec/unit/puppet/provider/rabbitmq_binding/rabbitmqadmin_spec.rb b/spec/unit/puppet/provider/rabbitmq_binding/rabbitmqadmin_spec.rb index 980ac552e..feb46a9ca 100644 --- a/spec/unit/puppet/provider/rabbitmq_binding/rabbitmqadmin_spec.rb +++ b/spec/unit/puppet/provider/rabbitmq_binding/rabbitmqadmin_spec.rb @@ -1,8 +1,5 @@ -require 'puppet' -require 'mocha/api' -RSpec.configure do |config| - config.mock_with :mocha -end +require 'spec_helper' + provider_class = Puppet::Type.type(:rabbitmq_binding).provider(:rabbitmqadmin) describe provider_class do let(:resource) do diff --git a/spec/unit/puppet/provider/rabbitmq_exchange/rabbitmqadmin_spec.rb b/spec/unit/puppet/provider/rabbitmq_exchange/rabbitmqadmin_spec.rb index 697611564..709e55a17 100644 --- a/spec/unit/puppet/provider/rabbitmq_exchange/rabbitmqadmin_spec.rb +++ b/spec/unit/puppet/provider/rabbitmq_exchange/rabbitmqadmin_spec.rb @@ -1,8 +1,5 @@ -require 'puppet' -require 'mocha' -RSpec.configure do |config| - config.mock_with :mocha -end +require 'spec_helper' + provider_class = Puppet::Type.type(:rabbitmq_exchange).provider(:rabbitmqadmin) describe provider_class do let(:resource) do diff --git a/spec/unit/puppet/provider/rabbitmq_parameter/rabbitmqctl_spec.rb b/spec/unit/puppet/provider/rabbitmq_parameter/rabbitmqctl_spec.rb index 63e9dcc35..5162edda4 100644 --- a/spec/unit/puppet/provider/rabbitmq_parameter/rabbitmqctl_spec.rb +++ b/spec/unit/puppet/provider/rabbitmq_parameter/rabbitmqctl_spec.rb @@ -1,9 +1,4 @@ -require 'puppet' -require 'mocha' - -RSpec.configure do |config| - config.mock_with :mocha -end +require 'spec_helper' describe Puppet::Type.type(:rabbitmq_parameter).provider(:rabbitmqctl) do let(:resource) do diff --git a/spec/unit/puppet/provider/rabbitmq_plugin/rabbitmqctl_spec.rb b/spec/unit/puppet/provider/rabbitmq_plugin/rabbitmqctl_spec.rb index 385b3ea57..3c0a757b1 100644 --- a/spec/unit/puppet/provider/rabbitmq_plugin/rabbitmqctl_spec.rb +++ b/spec/unit/puppet/provider/rabbitmq_plugin/rabbitmqctl_spec.rb @@ -1,8 +1,5 @@ -require 'puppet' -require 'mocha' -RSpec.configure do |config| - config.mock_with :mocha -end +require 'spec_helper' + provider_class = Puppet::Type.type(:rabbitmq_plugin).provider(:rabbitmqplugins) describe provider_class do let(:resource) do diff --git a/spec/unit/puppet/provider/rabbitmq_policy/rabbitmqctl_spec.rb b/spec/unit/puppet/provider/rabbitmq_policy/rabbitmqctl_spec.rb index e4cdcff60..b1a871257 100644 --- a/spec/unit/puppet/provider/rabbitmq_policy/rabbitmqctl_spec.rb +++ b/spec/unit/puppet/provider/rabbitmq_policy/rabbitmqctl_spec.rb @@ -1,9 +1,4 @@ -require 'puppet' -require 'mocha' - -RSpec.configure do |config| - config.mock_with :mocha -end +require 'spec_helper' describe Puppet::Type.type(:rabbitmq_policy).provider(:rabbitmqctl) do let(:resource) do diff --git a/spec/unit/puppet/provider/rabbitmq_queue/rabbitmqadmin_spec.rb b/spec/unit/puppet/provider/rabbitmq_queue/rabbitmqadmin_spec.rb index 002a5e144..c07a182a5 100644 --- a/spec/unit/puppet/provider/rabbitmq_queue/rabbitmqadmin_spec.rb +++ b/spec/unit/puppet/provider/rabbitmq_queue/rabbitmqadmin_spec.rb @@ -1,8 +1,5 @@ -require 'puppet' -require 'mocha/api' -RSpec.configure do |config| - config.mock_with :mocha -end +require 'spec_helper' + provider_class = Puppet::Type.type(:rabbitmq_queue).provider(:rabbitmqadmin) describe provider_class do let(:resource) do diff --git a/spec/unit/puppet/provider/rabbitmq_user/rabbitmqctl_spec.rb b/spec/unit/puppet/provider/rabbitmq_user/rabbitmqctl_spec.rb index d70374e04..7043d7dce 100644 --- a/spec/unit/puppet/provider/rabbitmq_user/rabbitmqctl_spec.rb +++ b/spec/unit/puppet/provider/rabbitmq_user/rabbitmqctl_spec.rb @@ -1,8 +1,5 @@ -require 'puppet' -require 'mocha' -RSpec.configure do |config| - config.mock_with :mocha -end +require 'spec_helper' + provider_class = Puppet::Type.type(:rabbitmq_user).provider(:rabbitmqctl) describe provider_class do let(:resource) do diff --git a/spec/unit/puppet/provider/rabbitmq_user_permissions/rabbitmqctl_spec.rb b/spec/unit/puppet/provider/rabbitmq_user_permissions/rabbitmqctl_spec.rb index 9f809a295..76e9a1704 100644 --- a/spec/unit/puppet/provider/rabbitmq_user_permissions/rabbitmqctl_spec.rb +++ b/spec/unit/puppet/provider/rabbitmq_user_permissions/rabbitmqctl_spec.rb @@ -1,8 +1,5 @@ -require 'puppet' -require 'mocha' -RSpec.configure do |config| - config.mock_with :mocha -end +require 'spec_helper' + describe 'Puppet::Type.type(:rabbitmq_user_permissions).provider(:rabbitmqctl)' do let(:resource) do Puppet::Type::Rabbitmq_user_permissions.new( diff --git a/spec/unit/puppet/provider/rabbitmq_vhost/rabbitmqctl_spec.rb b/spec/unit/puppet/provider/rabbitmq_vhost/rabbitmqctl_spec.rb index 7fa36fa40..d4ed32840 100644 --- a/spec/unit/puppet/provider/rabbitmq_vhost/rabbitmqctl_spec.rb +++ b/spec/unit/puppet/provider/rabbitmq_vhost/rabbitmqctl_spec.rb @@ -1,8 +1,5 @@ -require 'puppet' -require 'mocha' -RSpec.configure do |config| - config.mock_with :mocha -end +require 'spec_helper' + provider_class = Puppet::Type.type(:rabbitmq_vhost).provider(:rabbitmqctl) describe provider_class do let(:resource) do