From cf31410877c7e2ba537905ee3367a43a6145aaa7 Mon Sep 17 00:00:00 2001 From: cblanc Date: Sun, 26 Apr 2015 11:35:02 +0100 Subject: [PATCH] Update poltergeist (current version uses out of date phantomjs) --- Gemfile | 2 +- Gemfile.lock | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index f22590d..b161b85 100644 --- a/Gemfile +++ b/Gemfile @@ -62,7 +62,7 @@ group :test do gem 'database_cleaner', '~> 1.2.0' gem 'rspec-rails', '~> 2.14.1' gem 'capybara', '~> 2.2.1' - gem 'poltergeist', '~> 1.5.0' + gem 'poltergeist', '~> 1.6.0' gem 'selenium-webdriver', '~> 2.41.0' gem 'factory_girl_rails', '~> 4.4.1' gem 'timecop', '~> 0.7.1' diff --git a/Gemfile.lock b/Gemfile.lock index 70af6dc..a090d97 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -149,7 +149,7 @@ GEM nokogiri (1.6.1) mini_portile (~> 0.5.0) oj (2.5.5) - poltergeist (1.5.0) + poltergeist (1.6.0) capybara (~> 2.1) cliver (~> 0.3.1) multi_json (~> 1.0) @@ -249,7 +249,9 @@ GEM execjs (>= 0.3.0) json (>= 1.8.0) websocket (1.0.7) - websocket-driver (0.3.3) + websocket-driver (0.5.4) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) will_paginate (3.0.5) xpath (2.0.0) nokogiri (~> 1.3) @@ -290,7 +292,7 @@ DEPENDENCIES newrelic_rpm (~> 3.7.2.195) nokogiri (~> 1.6.1) oj (~> 2.5.5) - poltergeist (~> 1.5.0) + poltergeist (~> 1.6.0) pry-byebug (~> 1.3.2) puma (~> 2.11.1) quiet_assets (~> 1.0.2)