diff options
| author | David Schmitt <david@dasz.at> | 2016-01-27 10:33:17 +0000 |
|---|---|---|
| committer | David Schmitt <david@dasz.at> | 2016-01-27 14:50:49 +0000 |
| commit | 20736ba6566854a274a9f9ac95937a843942aca6 (patch) | |
| tree | 76e3b3b2dc3dba8019f8562981581a32eb42dd68 /spec | |
| parent | 268e599839f86f7d5dd4352e73c0f698dc4b0c18 (diff) | |
(FM-4049) Update to current msync configs [2c99161]
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/spec_helper.rb | 17 | ||||
| -rw-r--r-- | spec/spec_helper_local.rb | 7 |
2 files changed, 11 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 diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb new file mode 100644 index 0000000..c7d27b5 --- /dev/null +++ b/spec/spec_helper_local.rb @@ -0,0 +1,7 @@ +require 'support/filesystem_helpers' +require 'support/fixture_helpers' + +RSpec.configure do |c| + c.include FilesystemHelpers + c.include FixtureHelpers +end |