From 3bdced6daa4be5140c5e1190ee81e56d95b93ff6 Mon Sep 17 00:00:00 2001
From: Martin Lensment <mlensment@gmail.com>
Date: Mon, 25 Aug 2014 14:29:53 +0300
Subject: [PATCH] Install phantomjs from gem

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

diff --git a/Gemfile b/Gemfile
index d5f86764f..975b962fb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -63,6 +63,7 @@ group :development, :test do
   gem 'capybara', '~> 2.4.1'
   # For feature testing
   # gem 'capybara-webkit', '1.2.0' # Webkit driver didn't work with turbolinks
+  gem 'phantomjs', :require => 'phantomjs/poltergeist'
   gem 'poltergeist', '~> 1.5.1' # We are using PhantomJS instead
 
   # For cleaning db in feature and epp tests
diff --git a/Gemfile.lock b/Gemfile.lock
index 337aad499..876fcd7cb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -93,6 +93,7 @@ GEM
     nokogiri (1.6.2.1)
       mini_portile (= 0.6.0)
     pg (0.17.1)
+    phantomjs (1.9.7.1)
     poltergeist (1.5.1)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
@@ -210,6 +211,7 @@ DEPENDENCIES
   jquery-rails
   nokogiri (~> 1.6.2.1)
   pg
+  phantomjs
   poltergeist (~> 1.5.1)
   pry (~> 0.10.1)
   pry-byebug (~> 1.3.3)