From e1e283e6a70ad83997924bf1059b016627f4fb49 Mon Sep 17 00:00:00 2001
From: John Dewey <john@dewey.ws>
Date: Sun, 2 Jun 2013 20:52:55 -0700
Subject: [PATCH] Tests were not passing due to postgresql cookbook

Changes to the upstream postgresql cookbook broke tests.
Gemfile.lock was updated to bring in fauxhai 1.1.1 which
has these attributes mocked.

Also, Berksfile.lock shouldn't be checked in.  Removed from
this patch, since it impacts testing.

Change-Id: Ic33bd1121b1612ee415de9e51f649f3c9c0a9763
---
 .gitignore   |  2 +-
 Gemfile      |  2 +-
 Gemfile.lock | 76 +++++++++++++++++++++++++++++++++++++---------------
 3 files changed, 57 insertions(+), 23 deletions(-)

diff --git a/.gitignore b/.gitignore
index f7fa15f9..1142e2d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 .bundle
 .cookbooks/
-Berkfile.lock
+Berksfile.lock
diff --git a/Gemfile b/Gemfile
index 81ba4197..ec9d752c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,5 +2,5 @@ source "https://rubygems.org"
 
 gem "chef", "~> 10.18.2"
 gem "berkshelf",  "~> 1.4.0"
-gem "chefspec", "~> 1.0.0"
+gem "chefspec", "~> 1.2.0"
 gem "foodcritic", "~> 2.1.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index 36b3985b..7c57f300 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,10 +5,13 @@ GEM
       i18n (= 0.6.1)
       multi_json (~> 1.0)
     addressable (2.3.4)
-    berkshelf (1.4.2)
+    akami (1.2.0)
+      gyoku (>= 0.4.0)
+      nokogiri (>= 1.4.0)
+    berkshelf (1.4.5)
       activesupport (>= 3.2.0)
       addressable
-      celluloid (>= 0.13.0)
+      celluloid (>= 0.14.0)
       chozo (>= 0.6.1)
       faraday (>= 0.8.5)
       hashie (>= 2.0.2)
@@ -18,13 +21,13 @@ GEM
       mixlib-shellout (~> 1.1)
       multi_json (~> 1.5)
       retryable
-      ridley (~> 0.9.0)
+      ridley (~> 0.12.4)
       solve (>= 0.4.2)
       thor (~> 0.18.0)
       yajl-ruby
-    builder (3.2.0)
+    builder (3.2.2)
     bunny (0.7.9)
-    celluloid (0.13.0)
+    celluloid (0.14.1)
       timers (>= 1.0.0)
     chef (10.18.2)
       bunny (>= 0.6.0, < 0.8.0)
@@ -44,10 +47,10 @@ GEM
       treetop (~> 1.4.9)
       uuidtools
       yajl-ruby (~> 1.1)
-    chefspec (1.0.0)
+    chefspec (1.2.0)
       chef (>= 10.0)
       erubis
-      fauxhai (~> 0.1)
+      fauxhai (>= 0.1.1, < 2.0)
       minitest-chef-handler (>= 0.6.0)
       rspec (~> 2.0)
     chozo (0.6.1)
@@ -60,10 +63,11 @@ GEM
     erubis (2.7.0)
     faraday (0.8.7)
       multipart-post (~> 1.1)
-    fauxhai (0.1.1)
-      chef
+    fauxhai (1.1.1)
       httparty
       net-ssh
+      ohai
+    ffi (1.8.1)
     foodcritic (2.1.0)
       erubis
       gherkin (~> 2.11.7)
@@ -73,14 +77,24 @@ GEM
       yajl-ruby (~> 1.1.0)
     gherkin (2.11.8)
       multi_json (~> 1.3)
-    hashie (2.0.4)
-    highline (1.6.18)
+    gssapi (1.0.3)
+      ffi (>= 1.0.1)
+    gyoku (1.0.0)
+      builder (>= 2.1.2)
+    hashie (2.0.5)
+    highline (1.6.19)
     httparty (0.11.0)
       multi_json (~> 1.0)
       multi_xml (>= 0.5.2)
+    httpclient (2.2.0.2)
+    httpi (0.9.7)
+      rack
     i18n (0.6.1)
     ipaddress (0.8.0)
     json (1.6.1)
+    little-plugger (1.1.3)
+    logging (1.6.2)
+      little-plugger (>= 1.1.3)
     mime-types (1.23)
     minitar (0.5.4)
     minitest (4.7.4)
@@ -95,7 +109,7 @@ GEM
     mixlib-log (1.6.0)
     mixlib-shellout (1.1.0)
     moneta (0.6.0)
-    multi_json (1.7.3)
+    multi_json (1.7.5)
     multi_xml (0.5.3)
     multipart-post (1.2.0)
     net-http-persistent (2.8)
@@ -106,6 +120,7 @@ GEM
       net-ssh (>= 2.1.4)
       net-ssh-gateway (>= 0.99.0)
     nokogiri (1.5.9)
+    nori (1.1.5)
     ohai (6.16.0)
       ipaddress
       mixlib-cli
@@ -115,27 +130,27 @@ GEM
       systemu
       yajl-ruby
     polyglot (0.3.3)
+    rack (1.5.2)
     rak (1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    retryable (1.3.2)
-    ridley (0.9.1)
-      activesupport (>= 3.2.0)
+    retryable (1.3.3)
+    ridley (0.12.4)
       addressable
-      celluloid (~> 0.13.0)
+      celluloid (~> 0.14.0)
       chozo (>= 0.6.0)
       erubis
       faraday (>= 0.8.4)
-      json (>= 1.5.0)
+      hashie (>= 2.0.2)
       mixlib-authentication (>= 1.3.0)
       mixlib-config (>= 1.1.0)
       mixlib-log (>= 1.3.0)
       mixlib-shellout (>= 1.1.0)
-      multi_json (>= 1.0.4)
       net-http-persistent (>= 2.8)
       net-ssh
       retryable
-      solve (>= 0.4.1)
+      solve (>= 0.4.4)
+      winrm (~> 1.1.0)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)
@@ -144,7 +159,16 @@ GEM
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.13.1)
-    solve (0.4.3)
+    rubyntlm (0.1.1)
+    savon (0.9.5)
+      akami (~> 1.0)
+      builder (>= 2.1.2)
+      gyoku (>= 0.4.0)
+      httpi (~> 0.9)
+      nokogiri (>= 1.4.0)
+      nori (~> 1.0)
+      wasabi (~> 1.0)
+    solve (0.4.4)
       json
     systemu (2.5.2)
     thor (0.18.1)
@@ -153,6 +177,16 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     uuidtools (2.1.4)
+    wasabi (1.0.0)
+      nokogiri (>= 1.4.0)
+    winrm (1.1.2)
+      gssapi (~> 1.0.0)
+      httpclient (~> 2.2.0.2)
+      logging (~> 1.6.1)
+      nokogiri (~> 1.5.0)
+      rubyntlm (~> 0.1.1)
+      savon (= 0.9.5)
+      uuidtools (~> 2.1.2)
     yajl-ruby (1.1.0)
 
 PLATFORMS
@@ -161,5 +195,5 @@ PLATFORMS
 DEPENDENCIES
   berkshelf (~> 1.4.0)
   chef (~> 10.18.2)
-  chefspec (~> 1.0.0)
+  chefspec (~> 1.2.0)
   foodcritic (~> 2.1.0)