summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kitchen-tests/Gemfile1
-rw-r--r--kitchen-tests/test/fixtures/serverspec_helper.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/kitchen-tests/Gemfile b/kitchen-tests/Gemfile
index 60df7ef388..88569aea66 100644
--- a/kitchen-tests/Gemfile
+++ b/kitchen-tests/Gemfile
@@ -11,4 +11,5 @@ group :end_to_end do
gem 'kitchen-vagrant' # Used for local testing
gem 'kitchen-ec2' # Used for remote (Travis) testing
+ gem 'ffi-yajl', '~> 1.1' # Go away, JSON gem
end
diff --git a/kitchen-tests/test/fixtures/serverspec_helper.rb b/kitchen-tests/test/fixtures/serverspec_helper.rb
index 04e99156d6..48963dc45d 100644
--- a/kitchen-tests/test/fixtures/serverspec_helper.rb
+++ b/kitchen-tests/test/fixtures/serverspec_helper.rb
@@ -22,7 +22,7 @@ def load_nodestub
platform = 'centos'
platform_version = os[:release].to_i
end
- FFI_Yajl::Encoder.parse(IO.read("#{ENV['BUSSER_ROOT']}/../kitchen/data/platforms/#{platform}/#{platform_version}.json"), :symbolize_names => true)
+ FFI_Yajl::Parser.parse(IO.read("#{ENV['BUSSER_ROOT']}/../kitchen/data/platforms/#{platform}/#{platform_version}.json"), :symbolize_names => true)
end
# centos-59 doesn't have /sbin in the default path,