Upgrade rspec, capybara and poltergeist

11 years ago · 6585b513ab
parent 4c5c0c7d0e
commit 6585b513ab
2 changed files with 56 additions and 57 deletions
--- a/14
+++ b/14
@ -30,8 +30,8 @@ group :development do
 end

 group :test, :development do
-  gem 'pry-rails',     '~> 0.2.2'
-  gem 'rspec-rails',   '~> 2.12.2'
+  gem 'pry-rails',     '~> 0.3.0'
+  gem 'rspec-rails',   '~> 2.13.2'
  gem 'cane',          '~> 2.5.2'
  gem 'jasmine-rails', '~> 0.3.2'
 end
@ -39,17 +39,17 @@ end
 group :test do
  gem "rake",                          '~> 10.0.4'
  gem 'factory_girl_rails',            '~> 4.2.0'
-  gem 'capybara',                      '~> 2.0.2'
-  gem 'poltergeist',                   '~> 1.1.2'
+  gem 'capybara',                      '~> 2.1.0'
+  gem 'poltergeist',                   '~> 1.3.0'
  gem 'database_cleaner',              '~> 0.9.1'
-  gem 'guard',                         '~> 1.6.2'
-  gem 'guard-rspec',                   '~> 2.4.0'
+  gem 'guard',                         '~> 1.7.0'
+  gem 'guard-rspec',                   '~> 2.5.4'
  gem 'guard-jasmine-headless-webkit', '~> 0.3.2'
  gem 'rb-inotify',                    '~> 0.8.8'
  gem 'simplecov',                     '~> 0.7.1', :require => false
 end

 group :production do
-  gem 'unicorn', '~> 4.5.0'
+  gem 'unicorn', '~> 4.6.2'
  gem 'dalli',   '~> 2.6.2'
 end
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -36,19 +36,18 @@ GEM
    builder (3.0.4)
    cane (2.5.2)
      parallel
-    capybara (2.0.2)
+    capybara (2.1.0)
      mime-types (>= 1.16)
      nokogiri (>= 1.3.3)
      rack (>= 1.0.0)
      rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 1.0.0)
+      xpath (~> 2.0)
    carrierwave (0.8.0)
      activemodel (>= 3.2.0)
      activesupport (>= 3.2.0)
-    childprocess (0.3.7)
-      ffi (~> 1.0, >= 1.0.6)
-    coderay (1.0.8)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
+    coderay (1.0.9)
    coffee-rails (3.2.2)
      coffee-script (>= 2.2.0)
      railties (~> 3.2.0)
@ -60,14 +59,14 @@ GEM
    daemons (1.1.9)
    dalli (2.6.2)
    database_cleaner (0.9.1)
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.4)
    draper (1.2.1)
      actionpack (>= 3.0)
      activesupport (>= 3.0)
      request_store (~> 1.0.3)
    erubis (2.7.0)
-    eventmachine (1.0.0)
-    eventmachine (1.0.0-java)
+    eventmachine (1.0.3)
+    eventmachine (1.0.3-java)
    excon (0.16.10)
    execjs (1.4.0)
      multi_json (~> 1.0)
@ -82,8 +81,8 @@ GEM
      eventmachine (>= 0.12.0)
    faye-websocket (0.4.7-java)
      eventmachine (>= 0.12.0)
-    ffi (1.3.1)
-    ffi (1.3.1-java)
+    ffi (1.8.1)
+    ffi (1.8.1-java)
    fog (1.9.0)
      builder
      excon (~> 0.14)
@ -98,16 +97,16 @@ GEM
    girl_friday (0.11.2)
      connection_pool (~> 1.0)
      rubinius-actor
-    guard (1.6.2)
+    guard (1.7.0)
+      formatador (>= 0.2.4)
      listen (>= 0.6.0)
      lumberjack (>= 1.0.2)
      pry (>= 0.9.10)
-      terminal-table (>= 1.4.3)
      thor (>= 0.14.6)
    guard-jasmine-headless-webkit (0.3.2)
      guard (>= 0.4.0)
      jasmine-headless-webkit (>= 0.7.0)
-    guard-rspec (2.4.0)
+    guard-rspec (2.5.4)
      guard (>= 1.1)
      rspec (~> 2.11)
    hashie (2.0.5)
@ -144,8 +143,8 @@ GEM
      actionpack (>= 3.0.0)
      activesupport (>= 3.0.0)
    kgio (2.8.0)
-    listen (0.7.2)
-    lumberjack (1.0.2)
+    listen (0.7.3)
+    lumberjack (1.0.3)
    mail (2.5.4)
      mime-types (~> 1.16)
      treetop (~> 1.4.8)
@ -156,8 +155,8 @@ GEM
    net-scp (1.0.4)
      net-ssh (>= 1.99.1)
    net-ssh (2.6.3)
-    nokogiri (1.5.6)
-    nokogiri (1.5.6-java)
+    nokogiri (1.5.9)
+    nokogiri (1.5.9-java)
    oauth (0.4.7)
    oauth2 (0.8.1)
      faraday (~> 0.8)
@ -183,21 +182,21 @@ GEM
    open4 (1.3.0)
    parallel (0.6.1)
    pg (0.14.1)
-    poltergeist (1.1.2)
-      capybara (~> 2.0.1)
-      faye-websocket (~> 0.4.4)
+    poltergeist (1.3.0)
+      capybara (~> 2.1.0)
+      faye-websocket (>= 0.4.4, < 0.5.0)
      http_parser.rb (~> 0.5.3)
    polyglot (0.3.3)
-    pry (0.9.11.4)
+    pry (0.9.12.2)
      coderay (~> 1.0.5)
      method_source (~> 0.8)
      slop (~> 3.4)
-    pry (0.9.11.4-java)
+    pry (0.9.12.2-java)
      coderay (~> 1.0.5)
      method_source (~> 0.8)
      slop (~> 3.4)
      spoon (~> 0.0)
-    pry-rails (0.2.2)
+    pry-rails (0.3.0)
      pry (>= 0.9.10)
    quiet_assets (1.0.1)
      railties (~> 3.1)
@ -224,7 +223,7 @@ GEM
      rdoc (~> 3.4)
      thor (>= 0.14.6, < 2.0)
    rainbow (1.1.4)
-    raindrops (0.10.0)
+    raindrops (0.11.0)
    rake (10.0.4)
    rb-inotify (0.8.8)
      ffi (>= 0.5.0)
@ -232,21 +231,21 @@ GEM
      json (~> 1.4)
    redcarpet (2.2.2)
    request_store (1.0.5)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
-    rspec-rails (2.12.2)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    rspec-rails (2.13.2)
      actionpack (>= 3.0)
      activesupport (>= 3.0)
      railties (>= 3.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
    rubinius-actor (0.0.2)
      rubinius-core-api
    rubinius-core-api (0.0.1)
@ -258,7 +257,7 @@ GEM
      railties (~> 3.2.0)
      sass (>= 3.1.10)
      tilt (~> 1.3)
-    selenium-webdriver (2.29.0)
+    selenium-webdriver (2.33.0)
      childprocess (>= 0.2.5)
      multi_json (~> 1.0)
      rubyzip
@ -270,14 +269,14 @@ GEM
      multi_json (~> 1.0)
      simplecov-html (~> 0.7.1)
    simplecov-html (0.7.1)
-    slop (3.4.3)
-    spoon (0.0.1)
+    slop (3.4.5)
+    spoon (0.0.4)
+      ffi
    sprockets (2.2.2)
      hike (~> 1.2)
      multi_json (~> 1.0)
      rack (~> 1.0)
      tilt (~> 1.1, != 1.3.0)
-    terminal-table (1.4.5)
    thin (1.5.0)
      daemons (>= 1.0.9)
      eventmachine (>= 0.12.6)
@ -291,12 +290,12 @@ GEM
    uglifier (1.3.0)
      execjs (>= 0.3.0)
      multi_json (~> 1.0, >= 1.0.2)
-    unicorn (4.5.0)
+    unicorn (4.6.2)
      kgio (~> 2.6)
      rack
      raindrops (~> 0.7)
    websocket (1.0.7)
-    xpath (1.0.0)
+    xpath (2.0.0)
      nokogiri (~> 1.3)

 PLATFORMS
@ -306,7 +305,7 @@ PLATFORMS
 DEPENDENCIES
  airbrake (~> 3.1.7)
  cane (~> 2.5.2)
-  capybara (~> 2.0.2)
+  capybara (~> 2.1.0)
  carrierwave (~> 0.8.0)
  coffee-rails (~> 3.2.2)
  dalli (~> 2.6.2)
@ -315,9 +314,9 @@ DEPENDENCIES
  factory_girl_rails (~> 4.2.0)
  fog (~> 1.9.0)
  girl_friday (~> 0.11.2)
-  guard (~> 1.6.2)
+  guard (~> 1.7.0)
  guard-jasmine-headless-webkit (~> 0.3.2)
-  guard-rspec (~> 2.4.0)
+  guard-rspec (~> 2.5.4)
  jasmine-rails (~> 0.3.2)
  jquery-rails (~> 2.2.0)
  kaminari (~> 0.14.1)
@ -326,17 +325,17 @@ DEPENDENCIES
  omniauth-twitter (~> 0.0.16)
  open4 (~> 1.3.0)
  pg (~> 0.14.1)
-  poltergeist (~> 1.1.2)
-  pry-rails (~> 0.2.2)
+  poltergeist (~> 1.3.0)
+  pry-rails (~> 0.3.0)
  quiet_assets (~> 1.0.1)
  rails (= 3.2.13)
  rake (~> 10.0.4)
  rb-inotify (~> 0.8.8)
  redcarpet (~> 2.2.2)
-  rspec-rails (~> 2.12.2)
+  rspec-rails (~> 2.13.2)
  sass-rails (~> 3.2.6)
  simple_form (~> 2.0.4)
  simplecov (~> 0.7.1)
  thin (~> 1.5.0)
  uglifier (>= 1.0.3)
-  unicorn (~> 4.5.0)
+  unicorn (~> 4.6.2)