Merge remote-tracking branch 'shared/master'

1 files changed, 9 insertions, 3 deletions

diff --git a/Rakefile b/Rakefile
index 0c37d3b..ed73446 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,9 +1,14 @@
 require 'rubygems'
 # keep for compatibility for now
 require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet-lint/tasks/puppet-lint'
-PuppetLint.configuration.send('disable_80chars')
-PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
+task :tests do
+  # run syntax checks on manifests, templates and hiera data
+  # also runs :metadata_lint
+  Rake::Task[:validate].invoke
+
+  # runs puppet-lint
+  Rake::Task[:lint].invoke
+end
 
 # use librarian-puppet to manage fixtures instead of .fixtures.yml
 # offers more possibilities like explicit version management, forge downloads,...
@@ -14,4 +19,5 @@ task :librarian_spec_prep do
     sh "ln -s #{pwd} #{pwd}/spec/fixtures/modules/tor"
   end
 end
+
 task :spec_prep => :librarian_spec_prep