summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Price <chris@puppetlabs.com>2012-04-11 17:23:30 -0700
committerChris Price <chris@puppetlabs.com>2012-04-11 17:23:30 -0700
commit83cdff9e0521fb89a90d2df4655b0fdd9d710a67 (patch)
treecf86cbc5e09600f2fc261989750c470ff5bbd889
parentb9a33851d22d1530e018c74fc802fcb99a930268 (diff)
parent85f96dfb2496ffc0c1be5afa43e2f15315561f2e (diff)
downloadpuppet-stdlib-83cdff9e0521fb89a90d2df4655b0fdd9d710a67.tar.gz
puppet-stdlib-83cdff9e0521fb89a90d2df4655b0fdd9d710a67.tar.bz2
Merge pull request #61 from cprice-puppet/ticket/master/13693-use-puppetlabs-spec-helper
(#13693) moving logic from local spec_helper to puppetlabs_spec_helper
-rw-r--r--spec/spec_helper.rb73
1 files changed, 5 insertions, 68 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 0f3248b..f64fcba 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -10,90 +10,27 @@ require 'mocha'
gem 'rspec', '>=2.0.0'
require 'rspec/expectations'
+
# So everyone else doesn't have to include this base constant.
module PuppetSpec
FIXTURE_DIR = File.join(dir = File.expand_path(File.dirname(__FILE__)), "fixtures") unless defined?(FIXTURE_DIR)
end
-require 'pathname'
-require 'tmpdir'
-
-require 'puppet_spec/verbose'
+# TODO: ultimately would like to move these requires into the puppet_spec_helper.rb file, but the namespaces
+# are not currently the same between the two, so tests would need to be modified. Not ready to undertake that
+# just yet.
require 'puppet_spec/files'
-require 'puppet_spec/fixtures'
-require 'puppet_spec/matchers'
-require 'monkey_patches/alias_should_to_must'
-require 'monkey_patches/publicize_methods'
-
-# JJM Hack to make the stdlib tests run in Puppet 2.6 (See puppet commit cf183534)
-if not Puppet.constants.include? "Test" then
- module Puppet::Test
- class LogCollector
- def initialize(logs)
- @logs = logs
- end
-
- def <<(value)
- @logs << value
- end
- end
- end
- Puppet::Util::Log.newdesttype :log_collector do
- match "Puppet::Test::LogCollector"
- def initialize(messages)
- @messages = messages
- end
+require 'puppet_spec_helper'
- def handle(msg)
- @messages << msg
- end
- end
-end
-
-Pathname.glob("#{dir}/shared_behaviours/**/*.rb") do |behaviour|
- require behaviour.relative_path_from(Pathname.new(dir))
-end
RSpec.configure do |config|
- include PuppetSpec::Fixtures
-
- config.mock_with :mocha
config.before :each do
GC.disable
-
-
- # REVISIT: I think this conceals other bad tests, but I don't have time to
- # fully diagnose those right now. When you read this, please come tell me
- # I suck for letting this float. --daniel 2011-04-21
- Signal.stubs(:trap)
-
- # We're using send because this is a private method to communicate it
- # should only be used for tests. Puppet 2.6.x does not have the method.
- Puppet.settings.send(:initialize_everything_for_tests) unless Puppet.version =~ /^2\.6/
-
-
- @logs = []
- Puppet::Util::Log.newdestination(Puppet::Test::LogCollector.new(@logs))
-
- @log_level = Puppet::Util::Log.level
end
config.after :each do
- # We're using send because this is a private method to communicate it
- # should only be used for tests. Puppet 2.6.x does not have the method.
- Puppet.settings.send(:clear_everything_for_tests) unless Puppet.version =~ /^2\.6/
- Puppet::Node::Environment.clear
- Puppet::Util::Storage.clear
- Puppet::Util::ExecutionStub.reset if Puppet::Util.constants.include? "ExecutionStub"
-
- PuppetSpec::Files.cleanup
-
- @logs.clear
- Puppet::Util::Log.close_all
- Puppet::Util::Log.level = @log_level
-
GC.enable
end
end