From: Clayton O'Neill <clayton@oneill.net>
Date: Fri, 20 Jun 2014 11:51:19 +0000 (-0400)
Subject: Normalize Gemfile & pin tests to rspec < 2.99
X-Git-Tag: 5.0.0~21
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=bea7794633943e454fe3e99ee119298c3d0000ff;p=puppet-modules%2Fpuppet-ceilometer.git

Normalize Gemfile & pin tests to rspec < 2.99

Pin to rspec < 2.99 until rspec-puppet officially supports rspec 3.x.
This is to avoid warnings due to deprecated matchers in the
rspec-puppet gem.

This change is also intended to normalize the Gemfile for all stackforge
puppet modules.  This should facilitate pinning gem versions when
releasing new stable branches, since the same diff can be used for all
repos.

Change-Id: Ia1286824cebca09e20bf6d11a3435982b93442b9
Partial-Bug: #1326034
---

diff --git a/Gemfile b/Gemfile
index 0d35201..d965fa9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,6 +4,9 @@ group :development, :test do
   gem 'puppetlabs_spec_helper', :require => false
   gem 'puppet-lint', '~> 0.3.2'
   gem 'rake', '10.1.1'
+  gem 'rspec', '< 2.99'
+  gem 'json'
+  gem 'webmock'
 end
 
 if puppetversion = ENV['PUPPET_GEM_VERSION']