Merge pull request #30 from UKHomeOffice/bugfix/29-phantomjs-path

fixed phantom js not being added to path #29

acceptance_tests/Gemfile

@@ -2,9 +2,9 @@ source "https://rubygems.org"
 
 gem 'cucumber'
 gem 'capybara'
-gem 'poltergeist'
 gem 'rspec'
-gem 'phantomjs'
+gem 'poltergeist'
+gem 'phantomjs', :group => :test
 gem 'show_me_the_cookies'
 gem 'yard-cucumber'
-gem 'selenium-webdriver', '2.45.0'
+gem 'selenium-webdriver', '2.45.0'

acceptance_tests/features/support/env.rb

@@ -4,6 +4,7 @@
 require 'rspec'
 require 'show_me_the_cookies'
 require 'capybara/poltergeist'
+require 'phantomjs'
 # require 'selenium-webdriver'
 
 require 'yaml'
@@ -26,6 +27,9 @@
   end
 else
   Capybara.run_server = false
+  Capybara.register_driver :poltergeist do |app|
+    Capybara::Poltergeist::Driver.new(app, :phantomjs => Phantomjs.path)
+  end
   Capybara.default_driver = :poltergeist
 end
 
@@ -66,4 +70,4 @@ def rest
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = 'random'
-end
+end

app.js

@@ -6,8 +6,7 @@ var path = require('path');
 var logger = require('./lib/logger');
 var churchill = require('churchill');
 var session = require('express-session');
-var redis = require('redis');
-var RedisStore = require('connect-redis-crypto')(session);
+
 var config = require('./config');
 require('moment-business');
 
@@ -45,6 +44,8 @@ app.set('trust proxy', 1);
 /*************************************/
 /******* Redis session storage *******/
 /*************************************/
+var redis = require('redis');
+var RedisStore = require('connect-redis-crypto')(session);
 var client = redis.createClient(config.redis.port, config.redis.host);
 
 client.on('connecting', function redisConnecting() {