From 9be7b5eecccf9014db113b05b376914a18a9c0c7 Mon Sep 17 00:00:00 2001
From: alexs333 <aserdyuk@dius.com.au>
Date: Fri, 23 Aug 2013 15:40:04 +1000
Subject: [PATCH] Updated poltergeist.

---
 Gemfile.lock | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e981d05df8..30f759e9ca 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -189,15 +189,12 @@ GEM
       multi_json (~> 1.0)
     builder (3.0.4)
     cancan (1.6.8)
-    capybara (2.0.2)
+    capybara (2.1.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 1.0.0)
-    childprocess (0.3.9)
-      ffi (~> 1.0, >= 1.0.11)
+      xpath (~> 2.0)
     chunky_png (1.2.8)
     climate_control (0.0.3)
       activesupport (>= 3.0)
@@ -259,7 +256,6 @@ GEM
     faye-websocket (0.4.7)
       eventmachine (>= 0.12.0)
     ffaker (1.15.0)
-    ffi (1.4.0)
     fog (1.14.0)
       builder
       excon (~> 0.25.0)
@@ -304,12 +300,12 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     method_source (0.8.1)
-    mime-types (1.23)
+    mime-types (1.24)
     mini_portile (0.5.1)
     money (5.0.0)
       i18n (~> 0.4)
       json
-    multi_json (1.7.8)
+    multi_json (1.7.9)
     multi_xml (0.5.5)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
@@ -325,9 +321,9 @@ GEM
       cocaine (>= 0.0.2)
       mime-types
     pg (0.13.2)
-    poltergeist (1.1.2)
-      capybara (~> 2.0.1)
-      faye-websocket (~> 0.4.4)
+    poltergeist (1.3.0)
+      capybara (~> 2.1.0)
+      faye-websocket (>= 0.4.4, < 0.5.0)
       http_parser.rb (~> 0.5.3)
     polyamorous (0.5.0)
       activerecord (~> 3.0)
@@ -396,7 +392,6 @@ GEM
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
     ruby-hmac (0.4.0)
-    rubyzip (0.9.9)
     safe_yaml (0.9.5)
     sass (3.2.10)
     sass-rails (3.2.6)
@@ -405,11 +400,6 @@ GEM
       tilt (~> 1.3)
     select2-rails (3.2.1)
       thor (~> 0.14)
-    selenium-webdriver (2.31.0)
-      childprocess (>= 0.2.5)
-      multi_json (~> 1.0)
-      rubyzip
-      websocket (~> 1.0.4)
     shoulda-matchers (1.1.0)
       activesupport (>= 3.0.0)
     simplecov (0.7.1)
@@ -461,8 +451,7 @@ GEM
     webmock (1.13.0)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
-    websocket (1.0.7)
-    xpath (1.0.0)
+    xpath (2.0.0)
       nokogiri (~> 1.3)
 
 PLATFORMS