From 402b078c024106733161cd4edb9a53592bdc066d Mon Sep 17 00:00:00 2001
From: Reinier Balt <lrbalt@gmail.com>
Date: Sat, 23 Feb 2013 15:16:03 +0100
Subject: [PATCH] update gems

---
 Gemfile                                      |  5 ++++-
 Gemfile.lock                                 | 14 +++++---------
 features/support/tracks_cucumber_settings.rb |  3 ++-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index 7cb6f22e..b1a38ebe 100644
--- a/Gemfile
+++ b/Gemfile
@@ -47,8 +47,11 @@ group :test do
   gem "factory_girl_rails"
   gem "capybara"
   gem "cucumber-rails", :require => false
+  gem "rspec-expectations"
   gem "database_cleaner"
-  gem "aruba"
+
+  # aruba 0.5 conflics with newer gems
+  # gem "aruba", :require => false
   gem "simplecov"
   gem "timecop"
 
diff --git a/Gemfile.lock b/Gemfile.lock
index c9650a1c..f6e9f392 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -32,10 +32,6 @@ GEM
       multi_json (~> 1.0)
     acts_as_list (0.1.9)
     arel (3.0.2)
-    aruba (0.5.1)
-      childprocess (~> 0.3.6)
-      cucumber (>= 1.1.1)
-      rspec-expectations (>= 2.7.0)
     bcrypt-ruby (3.0.1)
     bluecloth (2.2.0)
     builder (3.0.4)
@@ -78,7 +74,7 @@ GEM
     factory_girl_rails (4.2.1)
       factory_girl (~> 4.2.0)
       railties (>= 3.0.0)
-    ffi (1.3.1)
+    ffi (1.4.0)
     formatize (1.1.0)
       RedCloth (~> 4.2)
       actionpack (~> 3.0)
@@ -136,15 +132,15 @@ GEM
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
     rubyzip (0.9.9)
-    safe_yaml (0.7.1)
+    safe_yaml (0.8.3)
     sanitize (2.0.3)
       nokogiri (>= 1.4.4, < 1.6)
-    sass (3.2.5)
+    sass (3.2.6)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    selenium-webdriver (2.29.0)
+    selenium-webdriver (2.30.0)
       childprocess (>= 0.2.5)
       multi_json (~> 1.0)
       rubyzip
@@ -192,7 +188,6 @@ DEPENDENCIES
   RedCloth
   aasm
   acts_as_list
-  aruba
   bcrypt-ruby
   bullet
   cache_digests
@@ -208,6 +203,7 @@ DEPENDENCIES
   rack-mini-profiler
   rails (~> 3.2)
   rails_autolink
+  rspec-expectations
   sanitize
   sass-rails
   selenium-webdriver
diff --git a/features/support/tracks_cucumber_settings.rb b/features/support/tracks_cucumber_settings.rb
index 46d4605b..7809cce1 100644
--- a/features/support/tracks_cucumber_settings.rb
+++ b/features/support/tracks_cucumber_settings.rb
@@ -1,4 +1,5 @@
-require 'aruba/cucumber'
+# commented out because aruba 0.5 conflics
+# require 'aruba/cucumber'
 
 require 'capybara/rails'
 require 'capybara/cucumber'