From aeb3ea63ec561440c02f9d4c4d4c0ac3a1d096c9 Mon Sep 17 00:00:00 2001 From: Ashley Penney Date: Wed, 18 Sep 2013 15:59:44 -0400 Subject: Overhaul the spec tests to work in rspec2. This work gets rid of the provider_example_group and reworks everything to work properly against rspec2. I don't know if I'd consider the style "better" but it works. --- spec/spec_helper.rb | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) (limited to 'spec/spec_helper.rb') diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 3bac650..acfae0c 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,25 +1,13 @@ -require 'pathname' -dir = Pathname.new(__FILE__).parent -$LOAD_PATH.unshift(dir, dir + 'lib', dir + '../lib') +require 'puppetlabs_spec_helper/module_spec_helper' +require 'simplecov' +require 'support/filesystem_helpers' +require 'support/fixture_helpers' -require 'test/unit' -require 'mocha' -require 'puppet' -gem 'rspec', '>= 1.2.9' -require 'spec/autorun' - -Dir[File.join(File.dirname(__FILE__), 'support', '*.rb')].each do |support_file| - require support_file -end - -Spec::Runner.configure do |config| - config.mock_with :mocha - config.include(FixtureHelpers) - config.include(FilesystemHelpers) +SimpleCov.start do + add_filter "/spec/" end -# We need this because the RAL uses 'should' as a method. This -# allows us the same behaviour but with a different method name. -class Object - alias :must :should +RSpec.configure do |c| + c.include FilesystemHelpers + c.include FixtureHelpers end -- cgit v1.2.3 From 1a27cd10cb52fe963c864aea9e2b6011a4305872 Mon Sep 17 00:00:00 2001 From: Aaron Stone Date: Sat, 13 Sep 2014 23:34:46 -0700 Subject: Disable simplecov on Ruby 1.8.7 --- spec/spec_helper.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'spec/spec_helper.rb') diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index acfae0c..ccd305b 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,10 +1,13 @@ require 'puppetlabs_spec_helper/module_spec_helper' -require 'simplecov' require 'support/filesystem_helpers' require 'support/fixture_helpers' -SimpleCov.start do - add_filter "/spec/" +# 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| -- cgit v1.2.3 From 20736ba6566854a274a9f9ac95937a843942aca6 Mon Sep 17 00:00:00 2001 From: David Schmitt Date: Wed, 27 Jan 2016 10:33:17 +0000 Subject: (FM-4049) Update to current msync configs [2c99161] --- spec/spec_helper.rb | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'spec/spec_helper.rb') 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 -- cgit v1.2.3 From 4e0338bbd79d5e46ccdf330a0520a75728dba503 Mon Sep 17 00:00:00 2001 From: David Schmitt Date: Tue, 16 Feb 2016 16:01:25 +0000 Subject: (FM-4046) Update to current msync configs [006831f] This moves all copyright statements to the NOTICE file in accordance with the ASFs guidelines on applying the Apache-2.0 license. --- spec/spec_helper.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'spec/spec_helper.rb') diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index a7f5b4e..22d5d68 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,3 +1,4 @@ +#This file is generated by ModuleSync, do not edit. require 'puppetlabs_spec_helper/module_spec_helper' # put local configuration and setup into spec_helper_local -- cgit v1.2.3