diff --git a/Gemfile b/Gemfile index 9cdfac74e..62d3b762f 100644 --- a/Gemfile +++ b/Gemfile @@ -148,7 +148,7 @@ group :test do gem 'fixture_builder', '0.3.5' gem 'fuubar', '1.1.0' gem 'rspec-instafail', '0.2.4', :require => false - gem 'selenium-webdriver', '2.27.2' + gem 'selenium-webdriver', '2.29.0' gem 'webmock', '1.8.11', :require => false diff --git a/Gemfile.lock b/Gemfile.lock index 5be6102ea..42d8e5c64 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -72,7 +72,7 @@ GEM carrierwave (0.7.1) activemodel (>= 3.2.0) activesupport (>= 3.2.0) - childprocess (0.3.6) + childprocess (0.3.7) ffi (~> 1.0, >= 1.0.6) client_side_validations (3.2.1) coderay (1.0.8) @@ -198,9 +198,6 @@ GEM actionpack (>= 3.0.0) activesupport (>= 3.0.0) kgio (2.7.4) - libwebsocket (0.1.7.1) - addressable - websocket listen (0.7.2) lumberjack (1.0.2) mail (2.4.4) @@ -355,11 +352,11 @@ GEM railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - selenium-webdriver (2.27.2) + selenium-webdriver (2.29.0) childprocess (>= 0.2.5) - libwebsocket (~> 0.1.3) multi_json (~> 1.0) rubyzip + websocket (~> 1.0.4) simple_oauth (0.2.0) sinatra (1.3.3) rack (~> 1.3, >= 1.3.6) @@ -400,7 +397,7 @@ GEM webmock (1.8.11) addressable (>= 2.2.7) crack (>= 0.1.7) - websocket (1.0.6) + websocket (1.0.7) will_paginate (3.0.4) xpath (0.1.4) nokogiri (~> 1.3) @@ -476,7 +473,7 @@ DEPENDENCIES rspec-rails (= 2.12.2) ruby-oembed (= 0.8.8) sass-rails (= 3.2.6) - selenium-webdriver (= 2.27.2) + selenium-webdriver (= 2.29.0) spork (= 1.0.0rc3) timecop (= 0.5.9) twitter (= 4.4.4)