diff --git a/Gemfile b/Gemfile index 3015fa5..9ab20f1 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" -gem "rails", "3.2.13" +gem "rails", "3.2.16" group :test do gem "bourne", "1.5.0" @@ -8,5 +8,5 @@ group :test do gem "pusher", "0.12.0" gem "pusher-fake", "0.11.0" gem "rspec-rails", "2.14.0" - gem "selenium-webdriver", "2.37.0" + gem "selenium-webdriver", "2.38.0" end diff --git a/Gemfile.lock b/Gemfile.lock index 72c7013..d197c4e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.13) - actionpack (= 3.2.13) - mail (~> 2.5.3) - actionpack (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) + actionmailer (3.2.16) + actionpack (= 3.2.16) + mail (~> 2.5.4) + actionpack (3.2.16) + activemodel (= 3.2.16) + activesupport (= 3.2.16) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -14,26 +14,26 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.13) - activesupport (= 3.2.13) + activemodel (3.2.16) + activesupport (= 3.2.16) builder (~> 3.0.0) - activerecord (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) + activerecord (3.2.16) + activemodel (= 3.2.16) + activesupport (= 3.2.16) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) - activesupport (3.2.13) - i18n (= 0.6.1) + activeresource (3.2.16) + activemodel (= 3.2.16) + activesupport (= 3.2.16) + activesupport (3.2.16) + i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) addressable (2.3.5) - arel (3.0.2) + arel (3.0.3) bourne (1.5.0) mocha (>= 0.13.2, < 0.15) builder (3.0.4) - capybara (2.1.0) + capybara (2.2.0) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) @@ -42,10 +42,10 @@ GEM childprocess (0.3.9) ffi (~> 1.0, >= 1.0.11) cookiejar (0.3.0) - cucumber (1.3.8) + cucumber (1.3.10) builder (>= 2.1.2) diff-lcs (>= 1.1.3) - gherkin (~> 2.12.1) + gherkin (~> 2.12) multi_json (>= 1.7.5, < 2.0) multi_test (>= 0.0.2) cucumber-rails (1.4.0) @@ -54,7 +54,7 @@ GEM nokogiri (>= 1.5.0) rails (>= 3.0.0) daemons (1.1.9) - diff-lcs (1.2.4) + diff-lcs (1.2.5) em-http-request (1.0.3) addressable (>= 2.2.3) cookiejar @@ -74,14 +74,14 @@ GEM hike (1.2.3) http_parser.rb (0.5.3) httpclient (2.3.4.1) - i18n (0.6.1) + i18n (0.6.9) journey (1.0.4) json (1.8.1) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) metaclass (0.0.1) - mime-types (1.25) + mime-types (1.25.1) mini_portile (0.5.2) mocha (0.14.0) metaclass (~> 0.0.1) @@ -106,17 +106,17 @@ GEM rack rack-test (0.6.2) rack (>= 1.0) - rails (3.2.13) - actionmailer (= 3.2.13) - actionpack (= 3.2.13) - activerecord (= 3.2.13) - activeresource (= 3.2.13) - activesupport (= 3.2.13) + rails (3.2.16) + actionmailer (= 3.2.16) + actionpack (= 3.2.16) + activerecord (= 3.2.16) + activeresource (= 3.2.16) + activesupport (= 3.2.16) bundler (~> 1.0) - railties (= 3.2.13) - railties (3.2.13) - actionpack (= 3.2.13) - activesupport (= 3.2.13) + railties (= 3.2.16) + railties (3.2.16) + actionpack (= 3.2.16) + activesupport (= 3.2.16) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -125,7 +125,7 @@ GEM rdoc (3.12.2) json (~> 1.4) rspec-core (2.14.7) - rspec-expectations (2.14.3) + rspec-expectations (2.14.4) diff-lcs (>= 1.1.3, < 2.0) rspec-mocks (2.14.4) rspec-rails (2.14.0) @@ -135,11 +135,11 @@ GEM rspec-core (~> 2.14.0) rspec-expectations (~> 2.14.0) rspec-mocks (~> 2.14.0) - rubyzip (1.0.0) - selenium-webdriver (2.37.0) + rubyzip (1.1.0) + selenium-webdriver (2.38.0) childprocess (>= 0.2.5) multi_json (~> 1.0) - rubyzip (~> 1.0.0) + rubyzip (~> 1.0) websocket (~> 1.0.4) signature (0.1.7) sprockets (2.2.2) @@ -147,9 +147,9 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - thin (1.5.1) + thin (1.6.1) daemons (>= 1.0.9) - eventmachine (>= 0.12.6) + eventmachine (>= 1.0.0) rack (>= 1.0.0) thor (0.18.1) tilt (1.4.1) @@ -169,6 +169,6 @@ DEPENDENCIES cucumber-rails (= 1.4.0) pusher (= 0.12.0) pusher-fake (= 0.11.0) - rails (= 3.2.13) + rails (= 3.2.16) rspec-rails (= 2.14.0) - selenium-webdriver (= 2.37.0) + selenium-webdriver (= 2.38.0)