summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keiser <jkeiser@opscode.com>2014-04-22 09:45:47 -0700
committerJohn Keiser <jkeiser@opscode.com>2014-04-22 09:45:47 -0700
commitc0c95d690e1bb7c17c2d141b4937a36c2072d800 (patch)
treec05fba3a737ae307c590718cefe73da5bfc9e7ed
parent9a32e76ef798ad122544eaf3a5b4c0b45f8d8152 (diff)
downloadchef-zero-c0c95d690e1bb7c17c2d141b4937a36c2072d800.tar.gz
Run chef local mode tests in Travis
-rw-r--r--.travis.yml3
-rw-r--r--Gemfile4
2 files changed, 5 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 4157396..6e5b74f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,6 +22,9 @@ matrix:
gemfile: Gemfile
- rvm: 2.1.1
gemfile: Gemfile
+ - rvm: 2.1.1
+ env: CHEF_FS=true
+ gemfile: Gemfile
allow_failures:
- rvm: 1.8.7
gemfile: Gemfile
diff --git a/Gemfile b/Gemfile
index f80fd68..21aa0be 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,5 +2,5 @@ source 'https://rubygems.org'
gemspec
gem 'rest-client', :github => 'opscode/rest-client'
-gem 'chef-pedant', :github => 'opscode/chef-pedant', :ref => '40ed2b11bcf4497e0d75e97bd91763c4edf2e353'
-gem 'chef', '>= 11.0'
+gem 'chef-pedant', :github => 'opscode/chef-pedant', :ref => '4744d7f318b629ff60a0d22cf02296df36936397'
+gem 'chef', :github => 'opscode/chef', :ref => 'd12cffbdfd4c55b3ddeec45f5bcb30719a298c83'