Browse Source

spec: Update for rubocop

Sebastien Badia 8 years ago
parent
commit
33e7c05266
2 changed files with 5 additions and 5 deletions
  1. 3 3
      Gemfile
  2. 2 2
      Rakefile

+ 3 - 3
Gemfile

@@ -1,17 +1,17 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 
 puppetversion = ENV.key?('PUPPET_VERSION') ? ENV['PUPPET_VERSION'] : ['>= 3.3']
 puppetversion = ENV.key?('PUPPET_VERSION') ? ENV['PUPPET_VERSION'] : ['>= 3.3']
+gem 'facter', '>= 1.7.0'
 gem 'metadata-json-lint'
 gem 'metadata-json-lint'
 gem 'puppet', puppetversion
 gem 'puppet', puppetversion
-gem 'puppetlabs_spec_helper', '>= 1.0.0'
 gem 'puppet-lint', '>= 1.0.0'
 gem 'puppet-lint', '>= 1.0.0'
-gem 'facter', '>= 1.7.0'
+gem 'puppetlabs_spec_helper', '>= 1.0.0'
 gem 'rspec-puppet'
 gem 'rspec-puppet'
 
 
 # rspec must be v2 for ruby 1.8.7
 # rspec must be v2 for ruby 1.8.7
 if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9'
 if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9'
-  gem 'rspec', '~> 2.0'
   gem 'rake', '~> 10.0'
   gem 'rake', '~> 10.0'
+  gem 'rspec', '~> 2.0'
 else
 else
   # rubocop requires ruby >= 1.9
   # rubocop requires ruby >= 1.9
   gem 'rubocop'
   gem 'rubocop'

+ 2 - 2
Rakefile

@@ -24,9 +24,9 @@ task :validate do
   end
   end
 end
 end
 
 
-desc 'Run metadata_lint, lint, validate, and spec tests.'
+desc 'Run metadata_lint, lint, validate, rubocop, and spec tests.'
 task :test do
 task :test do
-  [:metadata_lint, :lint, :validate, :spec].each do |test|
+  [:metadata_lint, :lint, :validate, :rubocop, :spec].each do |test|
     Rake::Task[test].invoke
     Rake::Task[test].invoke
   end
   end
 end
 end