Updates to testing infrastructure.

Author: fnichol

.travis.yml

@@ -1,6 +1,4 @@
 language: ruby
-gemfile:
-  - test/support/Gemfile
 rvm:
   - 1.9.3
-script: BUNDLE_GEMFILE=test/support/Gemfile bundle exec rake test foodcritic
+bundler_args: --without integration

Gemfile

@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+
+gem 'rake'
+gem 'minitest'
+gem 'foodcritic', :platforms => :ruby_19
+
+# allow CI to override the version of Chef for matrix testing
+gem 'chef', (ENV['CHEF_VERSION'] || '>= 0.10.10')

Rakefile

@@ -1,33 +1,14 @@
 #!/usr/bin/env rake
 require 'rake/testtask'
+require 'foodcritic'
 
 Rake::TestTask.new do |t|
-  t.libs.push "lib"
-  t.test_files = FileList['test/**/*_spec.rb']
+  t.test_files = FileList['test/unit/**/*_spec.rb']
   t.verbose = true
 end
 
-desc "Runs foodcritc linter"
-task :foodcritic do
-  if Gem::Version.new("1.9.2") <= Gem::Version.new(RUBY_VERSION.dup)
-    sandbox = File.join(File.dirname(__FILE__), %w{tmp foodcritic cookbook})
-    prepare_foodcritic_sandbox(sandbox)
-
-    sh "foodcritic --epic-fail any #{File.dirname(sandbox)}"
-  else
-    puts "WARN: foodcritic run is skipped as Ruby #{RUBY_VERSION} is < 1.9.2."
-  end
+FoodCritic::Rake::LintTask.new do |t|
+  t.options = { :fail_tags => ['any'] }
 end
 
-task :default => 'test'
-
-private
-
-def prepare_foodcritic_sandbox(sandbox)
-  files = %w{*.md *.rb attributes definitions files providers
-    recipes resources templates}
-
-  rm_rf sandbox
-  mkdir_p sandbox
-  cp_r Dir.glob("{#{files.join(',')}}"), sandbox
-end
+task :default => [:foodcritic, :test]

test/support/Gemfile

@@ -8,7 +8,7 @@
   before do
     @node = Chef::Node.new
     @node.consume_external_attrs(ohai_data, {})
-    @node.from_file(File.join(File.dirname(__FILE__), %w{.. .. attributes default.rb}))
+    @node.from_file(File.join(File.dirname(__FILE__), %w{.. .. .. attributes default.rb}))
   end
 
   let(:ohai_data) do

test/attributes/default_spec.rb test/unit/attributes/default_spec.rb

@@ -1,5 +1,5 @@
 require 'minitest/autorun'
-require File.expand_path(File.join(File.dirname(__FILE__), '../spec_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__), '../../spec_helper'))
 
 describe 'Chef::Provider::UserAccount' do
   include ProviderMixins

test/providers/account_spec.rb test/unit/providers/account_spec.rb

@@ -1,5 +1,5 @@
 require 'minitest/autorun'
-require File.expand_path(File.join(File.dirname(__FILE__), '../spec_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__), '../../spec_helper'))
 
 describe 'Chef::Resource::UserAccount' do
   include ResourceMixins