{maint} modulesync 0794b2c

CONTRIBUTING.md

@@ -208,11 +208,9 @@ review.
 Additional Resources
 ====================
 
-* [Getting additional help](http://puppetlabs.com/community/get-help)
+* [Getting additional help](http://puppet.com/community/get-help)
 
-* [Writing tests](http://projects.puppetlabs.com/projects/puppet/wiki/Development_Writing_Tests)
-
-* [Patchwork](https://patchwork.puppetlabs.com)
+* [Writing tests](https://docs.puppet.com/guides/module_guides/bgtm.html#step-three-module-testing)
 
 * [General GitHub documentation](http://help.github.com/)
 

Rakefile

@@ -4,11 +4,11 @@ require 'puppetlabs_spec_helper/rake_tasks'
 
 PuppetLint.configuration.fail_on_warnings = true
 PuppetLint.configuration.send('relative')
-PuppetLint.configuration.send('disable_80chars')
+PuppetLint.configuration.send('disable_140chars')
 PuppetLint.configuration.send('disable_class_inherits_from_params_class')
 PuppetLint.configuration.send('disable_documentation')
 PuppetLint.configuration.send('disable_single_quote_string_with_variables')
-PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
+PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp", "bundle/**/*", "vendor/**/*"]
 
 desc 'Generate pooler nodesets'
 task :gen_nodeset do

spec/unit/puppet/provider/ini_setting/inheritance_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 # This is a reduced version of ruby_spec.rb just to ensure we can subclass as
 # documented
-$: << 'spec/fixtures/modules/inherit_ini_setting/lib'
+$: << './spec/fixtures/modules/inherit_ini_setting/lib'
 provider_class = Puppet::Type.type(:inherit_ini_setting).provider(:ini_setting)
 describe provider_class do
   include PuppetlabsSpec::Files