diff options
author | Hunter Haugen <hunter@puppetlabs.com> | 2016-01-27 08:35:53 -0800 |
---|---|---|
committer | Hunter Haugen <hunter@puppetlabs.com> | 2016-01-27 08:35:53 -0800 |
commit | d7197aa5ab8639163c24ed8ba1d758a0969e51da (patch) | |
tree | 76e3b3b2dc3dba8019f8562981581a32eb42dd68 /spec/spec_helper.rb | |
parent | 268e599839f86f7d5dd4352e73c0f698dc4b0c18 (diff) | |
parent | 20736ba6566854a274a9f9ac95937a843942aca6 (diff) | |
download | puppet-vcsrepo-d7197aa5ab8639163c24ed8ba1d758a0969e51da.tar.gz puppet-vcsrepo-d7197aa5ab8639163c24ed8ba1d758a0969e51da.tar.bz2 |
Merge pull request #283 from DavidS/fm-4049-update-msync
(FM-4049) update to modulesync_configs
Diffstat (limited to 'spec/spec_helper.rb')
-rw-r--r-- | spec/spec_helper.rb | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index ccd305b..a7f5b4e 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,16 +1,7 @@ require 'puppetlabs_spec_helper/module_spec_helper' -require 'support/filesystem_helpers' -require 'support/fixture_helpers' -# SimpleCov does not run on Ruby 1.8.7 -unless RUBY_VERSION.to_f < 1.9 - require 'simplecov' - SimpleCov.start do - add_filter '/spec/' - end -end - -RSpec.configure do |c| - c.include FilesystemHelpers - c.include FixtureHelpers +# put local configuration and setup into spec_helper_local +begin + require 'spec_helper_local' +rescue LoadError end |