summaryrefslogtreecommitdiff
path: root/kitchen-tests
diff options
context:
space:
mode:
authortyler-ball <tyleraball@gmail.com>2014-09-24 10:24:43 -0700
committertyler-ball <tyleraball@gmail.com>2014-10-07 16:39:56 -0700
commitbd4becc6f45296f90ff2a0695ccab53fd1e57a4e (patch)
tree69a2f69edae35cf5d5e0d76f6eee5a09769438d5 /kitchen-tests
parent7b172fe93aeb0e23832340406c86d41728a49a56 (diff)
downloadchef-bd4becc6f45296f90ff2a0695ccab53fd1e57a4e.tar.gz
Having busser install ffy-yajl gem so it can use it for serverspec test runs
Diffstat (limited to 'kitchen-tests')
-rw-r--r--kitchen-tests/Gemfile1
-rw-r--r--kitchen-tests/test/integration/webapp/serverspec/Gemfile4
2 files changed, 4 insertions, 1 deletions
diff --git a/kitchen-tests/Gemfile b/kitchen-tests/Gemfile
index 88569aea66..60df7ef388 100644
--- a/kitchen-tests/Gemfile
+++ b/kitchen-tests/Gemfile
@@ -11,5 +11,4 @@ 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/integration/webapp/serverspec/Gemfile b/kitchen-tests/test/integration/webapp/serverspec/Gemfile
new file mode 100644
index 0000000000..0cb00ce354
--- /dev/null
+++ b/kitchen-tests/test/integration/webapp/serverspec/Gemfile
@@ -0,0 +1,4 @@
+# This Gemfile is only needed so that busser will install gems it needs for serverspec_helper.rb to work
+source "https://rubygems.org"
+
+gem 'ffi-yajl', '~> 1.1' # Go away, JSON gem