From 7bee04e5f6c615e7f5538668ec657db274a50153 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Mon, 22 Apr 2013 16:48:49 +1000
Subject: [PATCH] Update selenium-webdriver, test with eaterprises deployment
 settings by default

---
 Gemfile.lock        | 17 +++++++----------
 spec/spec_helper.rb |  3 +++
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index cdf2d6da28..3a0107d275 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -161,7 +161,7 @@ GEM
       i18n (~> 0.6)
       multi_json (~> 1.0)
     acts_as_list (0.1.4)
-    addressable (2.3.2)
+    addressable (2.3.4)
     andand (1.3.3)
     ansi (1.4.2)
     arel (3.0.2)
@@ -184,8 +184,8 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 1.0.0)
-    childprocess (0.3.6)
-      ffi (~> 1.0, >= 1.0.6)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
     climate_control (0.0.3)
       activesupport (>= 3.0)
     cocaine (0.5.1)
@@ -229,7 +229,7 @@ GEM
     faker (1.0.1)
       i18n (~> 0.4)
     ffaker (1.12.1)
-    ffi (1.3.1)
+    ffi (1.7.0)
     haml (3.1.6)
     highline (1.6.11)
     hike (1.2.2)
@@ -252,9 +252,6 @@ GEM
     letter_opener (1.0.0)
       launchy (>= 2.0.4)
     libv8 (3.3.10.4)
-    libwebsocket (0.1.7.1)
-      addressable
-      websocket
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -348,11 +345,11 @@ GEM
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    selenium-webdriver (2.27.2)
+    selenium-webdriver (2.32.1)
       childprocess (>= 0.2.5)
-      libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
+      websocket (~> 1.0.4)
     shoulda-matchers (1.1.0)
       activesupport (>= 3.0.0)
     slop (3.3.3)
@@ -385,7 +382,7 @@ GEM
     uuidtools (2.1.3)
     warden (1.1.1)
       rack (>= 1.0)
-    websocket (1.0.6)
+    websocket (1.0.7)
     xpath (1.0.0)
       nokogiri (~> 1.3)
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index ac124b8da9..8b33ac80a2 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -3,6 +3,9 @@ require 'spork'
 #uncomment the following line to use spork with the debugger
 #require 'spork/ext/ruby-debug'
 
+# By default, test on eaterprises deployment settings
+ENV['OFW_DEPLOYMENT'] ||= 'eaterprises'
+
 
 Spork.prefork do
   ENV["RAILS_ENV"] ||= 'test'