puppetlabs_spec_helper 0.4.0 → 0.4.1

data/CHANGELOG

@@ -1,4 +1,9 @@
-2012-12-14 Puppet Labs <info@puppetlabs.com> - 0.4.0-rc1
+2013-02-08 Puppet Labs <info@puppetlabs.com> - 0.4.1
+ * (#18165) Mark tests pending on broken puppet versions
+ * (#18165) Initialize TestHelper as soon as possible
+ * Maint: Change formatting and handle windows path separator
+
+2012-12-14 Puppet Labs <info@puppetlabs.com> - 0.4.0
  * Rake should fail if git can't clone repository
  * Add readme for fixtures
  * Fix Mocha deprecations

data/lib/puppetlabs_spec_helper/module_spec_helper.rb

@@ -16,7 +16,7 @@ fixture_path = File.expand_path(File.join(Dir.pwd, 'spec/fixtures'))
 env_module_path = ENV['MODULEPATH']
 module_path = File.join(fixture_path, 'modules')
 
-module_path = [module_path, env_module_path].join(':') if env_module_path
+module_path = [module_path, env_module_path].join(File::PATH_SEPARATOR) if env_module_path
 
 RSpec.configure do |c|
   c.module_path = module_path

data/lib/puppetlabs_spec_helper/puppet_spec_helper.rb

@@ -43,21 +43,27 @@ module Puppet
     # should be fairly future-proof as long as that API doesn't change, which it
     # hopefully will not need to.
     def self.initialize_via_testhelper(config)
+      begin
+        Puppet::Test::TestHelper.initialize
+      rescue NoMethodError
+        Puppet::Test::TestHelper.before_each_test
+      end
+
       # connect rspec hooks to TestHelper methods.
       config.before :all do
-        Puppet::Test::TestHelper.before_all_tests()
+        Puppet::Test::TestHelper.before_all_tests
       end
 
       config.after :all do
-        Puppet::Test::TestHelper.after_all_tests()
+        Puppet::Test::TestHelper.after_all_tests
       end
 
       config.before :each do
-        Puppet::Test::TestHelper.before_each_test()
+        Puppet::Test::TestHelper.before_each_test
       end
 
       config.after :each do
-        Puppet::Test::TestHelper.after_each_test()
+        Puppet::Test::TestHelper.after_each_test
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puppetlabs_spec_helper
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Puppet Labs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-26 00:00:00 Z
+date: 2013-02-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake