Revert bundle update; Bump rspec-rails version

The previous bundle update of all dependencies broke execution of unit tests: I've yet to determine a more specific cause. This partially reverts commit 6ea4ed825f. Signed-off-by: Alex Coles <alex@alexbcoles.com>
11 years ago · dbdef5766d
parent a0f7deb081
commit dbdef5766d
2 changed files with 103 additions and 101 deletions
--- a/3
+++ b/3
@ -138,7 +138,7 @@ group :test do
  gem "cucumber-rails-training-wheels" # http://aslakhellesoy.com/post/11055981222/the-training-wheels-came-off
  gem 'rspec', '~> 2.14'
  # also add to development group, so "spec" rake task gets loaded
-  gem "rspec-rails", "~> 2.0", :group => :development
+  gem "rspec-rails", "~> 2.14", :group => :development
  gem 'rspec-example_disabler'
  gem 'capybara'
  gem 'capybara-screenshot'
@ -221,3 +221,4 @@ Dir.glob File.expand_path("../{Gemfile.local,Gemfile.plugins,lib/plugins/*/Gemfi
  next unless File.readable?(file)
  instance_eval File.read(file)
 end
+
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -54,33 +54,31 @@ GEM
      multi_json (~> 1.0)
    acts_as_list (0.2.0)
      activerecord (>= 3.0)
-    addressable (2.3.6)
+    addressable (2.3.4)
    arel (3.0.3)
    awesome_nested_set (2.1.6)
      activerecord (>= 3.0.0)
    binding_of_caller (0.7.2)
      debug_inspector (>= 0.0.1)
+    bourne (1.4.0)
+      mocha (~> 0.13.2)
    builder (3.0.4)
-    byebug (2.7.0)
-      columnize (~> 0.3)
-      debugger-linecache (~> 1.2)
-    capybara (2.2.1)
+    byebug (2.3.1)
+      columnize (~> 0.3.6)
+      debugger-linecache (~> 1.2.0)
+    capybara (2.1.0)
      mime-types (>= 1.16)
      nokogiri (>= 1.3.3)
      rack (>= 1.0.0)
      rack-test (>= 0.5.4)
      xpath (~> 2.0)
-    capybara-screenshot (0.3.17)
+    capybara-screenshot (0.3.6)
      capybara (>= 1.0, < 3)
-      launchy
    celluloid (0.15.2)
      timers (~> 1.1.0)
-    celluloid-io (0.15.0)
-      celluloid (>= 0.15.0)
-      nio4r (>= 0.5.0)
-    childprocess (0.5.2)
+    childprocess (0.3.9)
      ffi (~> 1.0, >= 1.0.11)
-    codeclimate-test-reporter (0.3.0)
+    codeclimate-test-reporter (0.1.1)
      simplecov (>= 0.7.1, < 1.0.0)
    coderay (1.0.9)
    coffee-rails (3.2.2)
@ -89,84 +87,86 @@ GEM
    coffee-script (2.2.0)
      coffee-script-source
      execjs
-    coffee-script-source (1.7.0)
+    coffee-script-source (1.6.2)
    color-tools (1.3.0)
    columnize (0.3.6)
-    cucumber (1.3.14)
+    cucumber (1.3.8)
      builder (>= 2.1.2)
      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
+      gherkin (~> 2.12.1)
      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.1)
-    cucumber-rails (1.4.0)
+      multi_test (>= 0.0.2)
+    cucumber-rails (1.3.1)
      capybara (>= 1.1.2)
      cucumber (>= 1.2.0)
      nokogiri (>= 1.5.0)
-      rails (>= 3.0.0)
+      rails (~> 3.0)
    cucumber-rails-training-wheels (1.0.0)
      cucumber-rails (>= 1.1.1)
    daemons (1.1.9)
-    dalli (2.7.0)
-    database_cleaner (1.2.0)
+    dalli (2.6.4)
+    database_cleaner (1.0.1)
    date_validator (0.7.0)
      activemodel (>= 3)
    debug_inspector (0.0.2)
-    debugger (1.6.6)
+    debugger (1.6.0)
      columnize (>= 0.3.1)
      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.3.2)
+      debugger-ruby_core_source (~> 1.2.1)
    debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.3.2)
+    debugger-ruby_core_source (1.2.2)
    delayed_job (3.0.5)
      activesupport (~> 3.0)
    delayed_job_active_record (0.3.3)
      activerecord (>= 2.1.0, < 4)
      delayed_job (~> 3.0)
    diff-lcs (1.2.5)
-    docile (1.1.3)
    erubis (2.7.0)
    eventmachine (1.0.3)
-    execjs (2.0.2)
-    factory_girl (4.4.0)
+    execjs (1.4.0)
+      multi_json (~> 1.0)
+    factory_girl (4.2.0)
      activesupport (>= 3.0.0)
-    factory_girl_rails (4.4.1)
-      factory_girl (~> 4.4.0)
+    factory_girl_rails (4.2.1)
+      factory_girl (~> 4.2.0)
      railties (>= 3.0.0)
-    faker (1.3.0)
+    faker (1.2.0)
      i18n (~> 0.5)
    ffi (1.9.3)
    formatador (0.2.4)
    gherkin (2.12.2)
      multi_json (~> 1.3)
-    globalize (3.1.0)
-      activemodel (>= 3.1.0, < 4.0.0)
-      activerecord (>= 3.1.0, < 4.0.0)
-    guard (2.6.0)
+    globalize (3.0.0)
+      activemodel (>= 3.0.0)
+      activerecord (>= 3.0.0)
+      paper_trail (~> 2)
+    guard (2.2.2)
      formatador (>= 0.2.4)
-      listen (~> 2.7)
+      listen (~> 2.1)
      lumberjack (~> 1.0)
      pry (>= 0.9.12)
      thor (>= 0.18.1)
-    guard-cucumber (1.4.1)
+    guard-cucumber (1.4.0)
      cucumber (>= 1.2.0)
      guard (>= 1.1.0)
-    guard-rspec (4.2.8)
-      guard (~> 2.1)
-      rspec (>= 2.14, < 4.0)
-    guard-test (2.0.4)
-      guard (~> 2.0)
+    guard-rspec (3.1.0)
+      guard (>= 1.8)
+      rspec (~> 2.13)
+    guard-test (1.0.0)
+      guard (>= 1.8)
      test-unit (~> 2.2)
    hike (1.2.3)
    htmldiff (0.0.1)
-    i18n (0.6.9)
-    interception (0.5)
+    i18n (0.6.5)
+    interception (0.3)
    journey (1.0.4)
    jquery-atwho-rails (0.4.7)
    jquery-rails (2.0.3)
      railties (>= 3.1.0, < 5.0)
      thor (~> 0.14)
-    jquery-ui-rails (4.2.0)
-      railties (>= 3.2.16)
+    jquery-ui-rails (4.0.2)
+      jquery-rails
+      railties (>= 3.1.0)
    json (1.8.1)
    json_spec (1.1.1)
      multi_json (~> 1.0)
@ -175,49 +175,51 @@ GEM
      addressable (~> 2.3)
    letter_opener (1.0.0)
      launchy (>= 2.0.4)
-    libv8 (3.16.14.3)
-    listen (2.7.1)
+    libv8 (3.11.8.17)
+    listen (2.1.2)
      celluloid (>= 0.15.2)
-      celluloid-io (>= 0.15.0)
      rb-fsevent (>= 0.9.3)
      rb-inotify (>= 0.9)
-    lumberjack (1.0.5)
+    lumberjack (1.0.4)
    mail (2.5.4)
      mime-types (~> 1.16)
      treetop (~> 1.4.8)
+    metaclass (0.0.1)
    method_source (0.8.2)
    mime-types (1.25.1)
-    mini_portile (0.5.3)
-    multi_json (1.9.2)
-    multi_test (0.1.1)
-    mysql2 (0.3.15)
+    mocha (0.13.3)
+      metaclass (~> 0.0.1)
+    multi_json (1.8.2)
+    multi_test (0.0.2)
+    mysql2 (0.3.11)
    net-ldap (0.2.2)
-    nio4r (1.0.0)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
+    nokogiri (1.5.9)
    object-daddy (1.1.1)
-    oj (2.6.1)
+    oj (2.1.6)
+    paper_trail (2.7.2)
+      activerecord (~> 3.0)
+      railties (~> 3.0)
    pg (0.17.1)
-    polyglot (0.3.4)
+    polyglot (0.3.3)
    prototype-rails (3.2.1)
      rails (~> 3.2)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
+    pry (0.9.12.2)
+      coderay (~> 1.0.5)
      method_source (~> 0.8)
      slop (~> 3.4)
-    pry-byebug (1.3.2)
-      byebug (~> 2.7)
+    pry-byebug (1.2.0)
+      byebug (~> 2.2)
      pry (~> 0.9.12)
    pry-debugger (0.2.2)
      debugger (~> 1.3)
      pry (~> 0.9.10)
-    pry-doc (0.6.0)
-      pry (~> 0.9)
-      yard (~> 0.8)
+    pry-doc (0.4.6)
+      pry (>= 0.9)
+      yard (>= 0.8)
    pry-rails (0.3.2)
      pry (>= 0.9.10)
-    pry-rescue (1.4.0)
-      interception (>= 0.4)
+    pry-rescue (1.1.1)
+      interception (>= 0.3)
      pry
    pry-stack_explorer (0.4.9.1)
      binding_of_caller (>= 0.7)
@ -227,7 +229,7 @@ GEM
    rack (1.4.5)
    rack-cache (1.2)
      rack (>= 0.4)
-    rack-ssl (1.3.4)
+    rack-ssl (1.3.3)
      rack
    rack-test (0.6.2)
      rack (>= 1.0)
@ -245,7 +247,7 @@ GEM
    rails-dev-tweaks (0.6.1)
      actionpack (~> 3.1)
      railties (~> 3.1)
-    rails_autolink (1.1.5)
+    rails_autolink (1.1.0)
      rails (> 3.1)
    railties (3.2.17)
      actionpack (= 3.2.17)
@ -254,11 +256,11 @@ GEM
      rake (>= 0.8.7)
      rdoc (~> 3.4)
      thor (>= 0.14.6, < 2.0)
-    rake (10.2.2)
-    rb-fsevent (0.9.4)
-    rb-inotify (0.9.3)
+    rake (10.1.0)
+    rb-fsevent (0.9.3)
+    rb-inotify (0.9.2)
      ffi (>= 0.5.0)
-    rb-readline (0.5.1)
+    rb-readline (0.5.0)
    rdoc (3.12.2)
      json (~> 1.4)
    ref (1.0.5)
@ -281,13 +283,13 @@ GEM
      rspec-expectations (~> 2.14.0)
      rspec-mocks (~> 2.14.0)
    ruby-openid (2.2.3)
-    ruby-prof (0.14.2)
-    ruby-progressbar (1.4.2)
+    ruby-prof (0.13.0)
+    ruby-progressbar (1.2.0)
    rubytree (0.8.3)
      json (>= 1.7.5)
      structured_warnings (>= 0.1.3)
-    rubyzip (1.1.2)
-    sass (3.3.4)
+    rubyzip (1.1.0)
+    sass (3.2.9)
    sass-rails (3.2.6)
      railties (~> 3.2.0)
      sass (>= 3.1.10)
@ -295,61 +297,60 @@ GEM
    select2-rails (3.3.2)
      sass-rails (>= 3.2)
      thor (~> 0.14)
-    selenium-webdriver (2.41.0)
-      childprocess (>= 0.5.0)
+    selenium-webdriver (2.39.0)
+      childprocess (>= 0.2.5)
      multi_json (~> 1.0)
-      rubyzip (~> 1.0)
+      rubyzip
      websocket (~> 1.0.4)
    shoulda (3.5.0)
      shoulda-context (~> 1.0, >= 1.0.1)
      shoulda-matchers (>= 1.4.1, < 3.0)
-    shoulda-context (1.1.6)
-    shoulda-matchers (2.5.0)
+    shoulda-context (1.1.2)
+    shoulda-matchers (2.1.0)
      activesupport (>= 3.0.0)
-    simplecov (0.8.2)
-      docile (~> 1.1.0)
+      bourne (~> 1.3)
+    simplecov (0.8.0.pre)
      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    slop (3.5.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    slop (3.4.6)
    sprockets (2.2.2)
      hike (~> 1.2)
      multi_json (~> 1.0)
      rack (~> 1.0)
      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.9)
-    strong_parameters (0.2.3)
+    sqlite3 (1.3.7)
+    strong_parameters (0.2.1)
      actionpack (~> 3.0)
      activemodel (~> 3.0)
-      activesupport (~> 3.0)
      railties (~> 3.0)
    structured_warnings (0.1.4)
    svg-graph (1.0.5)
    syck (1.0.1)
    test-unit (2.5.5)
-    therubyracer (0.12.1)
-      libv8 (~> 3.16.14.0)
+    therubyracer (0.11.4)
+      libv8 (~> 3.11.8.12)
      ref
-    thin (1.6.2)
+    thin (1.5.1)
      daemons (>= 1.0.9)
-      eventmachine (>= 1.0.0)
+      eventmachine (>= 0.12.6)
      rack (>= 1.0.0)
-    thor (0.19.1)
+    thor (0.18.1)
    tilt (1.4.1)
-    timecop (0.6.3)
+    timecop (0.6.1)
    timers (1.1.0)
    treetop (1.4.15)
      polyglot
      polyglot (>= 0.3.1)
-    tzinfo (0.3.39)
-    uglifier (2.5.0)
+    tzinfo (0.3.38)
+    uglifier (2.1.1)
      execjs (>= 0.3.0)
-      json (>= 1.8.0)
+      multi_json (~> 1.0, >= 1.0.2)
    websocket (1.0.7)
    will_paginate (3.0.5)
    xpath (2.0.0)
      nokogiri (~> 1.3)
-    yard (0.8.7.4)
+    yard (0.8.7.2)

 PLATFORMS
  ruby
@ -415,7 +416,7 @@ DEPENDENCIES
  request_store
  rspec (~> 2.14)
  rspec-example_disabler
-  rspec-rails (~> 2.0)
+  rspec-rails (~> 2.14)
  ruby-openid (~> 2.2.3)
  ruby-prof
  ruby-progressbar