From 512d4914e59ccfdf5fa9cd12dad87024b53b40b8 Mon Sep 17 00:00:00 2001
From: John Keiser <john@johnkeiser.com>
Date: Thu, 8 Sep 2016 08:10:26 -0700
Subject: [PATCH] Pin oc-chef-pedant to prevent unintended test slippage

---
 Gemfile      |  3 +++
 Gemfile.lock | 41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/Gemfile b/Gemfile
index 8216e20b73d..9213be0a3ce 100644
--- a/Gemfile
+++ b/Gemfile
@@ -41,7 +41,10 @@ group(:integration) do
   gem "poise-boiler", git: "https://github.com/poise/poise-boiler"
   gem "knife-windows"
   gem "foodcritic"
+
   gem "cucumber-core", "< 2.0.0"
+  # We pin oc-chef-pedant to prevent it from updating out of lockstep with chef-zero
+  gem "oc-chef-pedant", git: "https://github.com/chef/chef-server"
 end
 
 group(:docgen) do
diff --git a/Gemfile.lock b/Gemfile.lock
index 03437ad9263..25c9a194900 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,19 @@
+GIT
+  remote: https://github.com/chef/chef-server
+  revision: dea545b10cbe209b89b30e782a58763407ba4526
+  specs:
+    oc-chef-pedant (2.2.0)
+      activesupport (~> 3.2)
+      erubis (~> 2.7)
+      mixlib-authentication (~> 1.4)
+      mixlib-config (~> 2.0)
+      mixlib-shellout (>= 1.1)
+      net-http-spy (~> 0.2)
+      rest-client (>= 1.6)
+      rspec (~> 3.2)
+      rspec-rerun (~> 1.0)
+      rspec_junit_formatter (~> 0.2)
+
 GIT
   remote: https://github.com/chef/chefstyle.git
   revision: c36dcbd6c2c21d2e19db77d9fbdf2402d0bacccf
@@ -132,6 +148,9 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (3.2.22.4)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
     addressable (2.4.0)
     appbundler (0.9.0)
       mixlib-cli (~> 1.4)
@@ -198,6 +217,8 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
     docile (1.1.5)
+    domain_name (0.5.20160826)
+      unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
     ethon (0.9.0)
       ffi (>= 1.3.0)
@@ -256,7 +277,10 @@ GEM
       thor
     hashie (3.4.4)
     highline (1.7.8)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
     httpclient (2.8.2.3)
+    i18n (0.7.0)
     inifile (3.0.0)
     iniparse (1.4.2)
     ipaddress (0.8.3)
@@ -312,6 +336,7 @@ GEM
     multipart-post (2.0.0)
     net-http-persistent (2.9.4)
     net-http-pipeline (1.0.1)
+    net-http-spy (0.2.1)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
@@ -382,6 +407,15 @@ GEM
     rainbow (2.1.0)
     rake (11.2.2)
     rb-readline (0.5.3)
+    rest-client (2.0.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    rest-client (2.0.0-x86-mingw32)
+      ffi (~> 1.9)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
     retryable (2.0.4)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
@@ -398,6 +432,8 @@ GEM
     rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
+    rspec-rerun (1.1.0)
+      rspec (~> 3.0)
     rspec-support (3.5.0)
     rspec_junit_formatter (0.2.3)
       builder (< 4)
@@ -465,6 +501,10 @@ GEM
     typhoeus (0.8.0)
       ethon (>= 0.8.0)
     ubuntu_ami (0.4.1)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.2)
+    unf_ext (0.0.7.2-x86-mingw32)
     unicode-display_width (1.1.1)
     url (0.3.2)
     uuidtools (2.1.5)
@@ -537,6 +577,7 @@ DEPENDENCIES
   knife-windows
   netrc
   nokogiri
+  oc-chef-pedant!
   octokit
   poise
   poise-boiler!