Upgrades gems, fixes specs

mezis · Aug 6, 2013 · 38474b4 · 38474b4
1 parent 5dcef7b
commit 38474b4
Show file tree

Hide file tree

Showing 5 changed files with 91 additions and 86 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 ruby '2.0.0'
 
-gem 'rails'
+gem 'rails', '~> 3.2.6'
 
 gem 'rainbows', group: :production
 gem 'thin',     group: :development

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,47 +1,47 @@
 GEM
   remote: http://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.14)
+      actionpack (= 3.2.14)
+      mail (~> 2.5.4)
+    actionpack (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
       rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
+    activemodel (3.2.14)
+      activesupport (= 3.2.14)
       builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
+    activerecord (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
       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.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
+    activesupport (3.2.14)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    addressable (2.3.4)
+    addressable (2.3.5)
     andand (1.3.3)
     animation (0.1.alpha.3)
       compass (>= 0.12.0)
       sass (>= 3.2.0.alpha.95)
     arel (3.0.2)
-    backports (3.3.2)
-    bcrypt-ruby (3.0.1)
+    backports (3.3.3)
+    bcrypt-ruby (3.1.1)
     better_errors (0.9.0)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    bootstrap-sass (2.3.2.0)
+    bootstrap-sass (2.3.2.1)
       sass (~> 3.2)
     builder (3.0.4)
     cancan (1.6.10)
@@ -62,7 +62,7 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.2)
+    coffee-script-source (1.6.3)
     colorize (0.5.8)
     compass (0.12.2)
       chunky_png (~> 1.2)
@@ -80,27 +80,28 @@ GEM
       thor
     css_parser (1.3.4)
       addressable
-    cucumber (1.3.2)
+    cucumber (1.3.5)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.12.0)
-      multi_json (~> 1.3)
+      multi_json (~> 1.7.5)
+      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)
     daemons (1.1.9)
     dalli (2.6.4)
-    database_cleaner (1.0.1)
+    database_cleaner (1.1.1)
     debug_inspector (0.0.2)
     default_value_for (2.0.3)
     descendants_tracker (0.0.1)
-    devise (2.2.4)
+    devise (3.0.1)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (~> 3.1)
-      warden (~> 1.2.1)
+      railties (>= 3.2.6, < 5)
+      warden (~> 1.2.3)
     diff-lcs (1.2.4)
     dragonfly (0.9.15)
       multi_json (~> 1.0)
@@ -109,18 +110,18 @@ GEM
     eventmachine (1.0.3)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    faker (1.1.2)
+    faker (1.2.0)
       i18n (~> 0.5)
-    faraday (0.8.7)
-      multipart-post (~> 1.1)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
     fast_gettext (0.7.1)
     faye-websocket (0.4.7)
       eventmachine (>= 0.12.0)
     ffi (1.9.0)
     fineuploader-rails (3.3)
       actionpack (>= 3.1)
       railties (>= 3.1)
-    font-awesome-rails (3.2.1.1)
+    font-awesome-rails (3.2.1.2)
       railties (>= 3.2, < 5.0)
     formatador (0.2.4)
     fssm (0.2.10)
@@ -132,7 +133,7 @@ GEM
     gherkin (2.12.0)
       multi_json (~> 1.3)
     gravtastic (3.2.6)
-    guard (1.8.1)
+    guard (1.8.2)
       formatador (>= 0.2.4)
       listen (>= 1.0.0)
       lumberjack (>= 1.0.2)
@@ -146,7 +147,7 @@ GEM
       guard (>= 1.1.0)
     guard-migrate (0.1.7)
       guard (>= 1.3.0)
-    guard-rails (0.4.4)
+    guard-rails (0.4.7)
       guard (>= 0.2.2)
     guard-rspec (3.0.2)
       guard (>= 1.8)
@@ -162,9 +163,9 @@ GEM
     hike (1.2.3)
     http_parser.rb (0.5.3)
     httpauth (0.2.0)
-    i18n (0.6.1)
+    i18n (0.6.4)
     journey (1.0.4)
-    jquery-rails (3.0.1)
+    jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.0)
@@ -173,28 +174,31 @@ GEM
     kgio (2.8.0)
     launchy (2.3.0)
       addressable (~> 2.3)
-    license_finder (0.8.1)
+    license_finder (0.9.1)
       bundler
+      rake
       sequel
       sqlite3
-    listen (1.2.2)
+      thor
+    listen (1.1.6)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
     locale (2.0.8)
-    lumberjack (1.0.3)
+    lumberjack (1.0.4)
     machinist (2.0)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     memcachier (0.0.2)
-    method_source (0.8.1)
+    method_source (0.8.2)
     mime-types (1.23)
-    mini_portile (0.5.0)
-    multi_json (1.7.7)
+    mini_portile (0.5.1)
+    multi_json (1.7.8)
+    multi_test (0.0.2)
     multipart-post (1.2.0)
-    mysql2 (0.3.11)
-    newrelic_rpm (3.6.4.122)
+    mysql2 (0.3.13)
+    newrelic_rpm (3.6.6.147)
     nifty-generators (0.4.6)
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
@@ -207,17 +211,17 @@ GEM
     omniauth (1.1.4)
       hashie (>= 1.2, < 3)
       rack
-    omniauth-github (1.1.0)
+    omniauth-github (1.1.1)
       omniauth (~> 1.0)
       omniauth-oauth2 (~> 1.1)
-    omniauth-google-oauth2 (0.1.19)
+    omniauth-google-oauth2 (0.2.0)
       omniauth (~> 1.0)
       omniauth-oauth2
     omniauth-oauth2 (1.1.1)
       oauth2 (~> 0.8.0)
       omniauth (~> 1.0)
     orm_adapter (0.4.0)
-    pg (0.15.1)
+    pg (0.16.0)
     poltergeist (1.1.2)
       capybara (~> 2.0.1)
       faye-websocket (~> 0.4.4)
@@ -232,7 +236,7 @@ GEM
       yard (>= 0.8)
     pry-nav (0.2.3)
       pry (~> 0.9.10)
-    pry-rails (0.3.1)
+    pry-rails (0.3.2)
       pry (>= 0.9.10)
     query_reviewer (0.1.8)
     quiet_assets (1.0.2)
@@ -244,17 +248,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.14)
+      actionmailer (= 3.2.14)
+      actionpack (= 3.2.14)
+      activerecord (= 3.2.14)
+      activeresource (= 3.2.14)
+      activesupport (= 3.2.14)
       bundler (~> 1.0)
-      railties (= 3.2.13)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
+      railties (= 3.2.14)
+    railties (3.2.14)
+      actionpack (= 3.2.14)
+      activesupport (= 3.2.14)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -274,31 +278,31 @@ GEM
       ffi (>= 0.5.0)
     rdoc (3.12.2)
       json (~> 1.4)
-    redcarpet (2.3.0)
+    redcarpet (3.0.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    roadie (2.3.4)
-      actionmailer (> 3.0.0, < 3.3.0)
-      css_parser
-      nokogiri (>= 1.4.4)
+    roadie (2.4.1)
+      actionmailer (> 3.0.0, < 5.0.0)
+      css_parser (~> 1.3.4)
+      nokogiri (> 1.5.0, < 1.7.0)
       sprockets
-    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)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.4)
+    rspec-expectations (2.14.0)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    rspec-rails (2.13.2)
+    rspec-mocks (2.14.2)
+    rspec-rails (2.14.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
     ruby-prof (0.13.0)
-    ruby_parser (3.1.3)
+    ruby_parser (3.2.2)
       sexp_processor (~> 4.1)
     rubyzip (0.9.9)
     sass (3.2.9)
@@ -311,10 +315,9 @@ GEM
       multi_json (~> 1.0)
       rubyzip
       websocket (~> 1.0.4)
-    sentry-raven (0.4.8)
+    sentry-raven (0.6.0)
       faraday (>= 0.7.6)
       hashie (>= 1.1.0)
-      multi_json (~> 1.0)
       uuidtools
     sequel (3.20.0)
     sexp_processor (4.2.1)
@@ -326,7 +329,7 @@ GEM
     simplecov-html (0.7.1)
     sinatra (1.0)
       rack (>= 1.0)
-    slop (3.4.5)
+    slop (3.4.6)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -347,14 +350,14 @@ GEM
       rack (>= 1.0.0)
     thor (0.18.1)
     tilt (1.4.1)
-    timecop (0.6.1)
+    timecop (0.6.3)
     treetop (1.4.14)
       polyglot
       polyglot (>= 0.3.1)
     turbolinks (1.3.0)
       coffee-rails
     tzinfo (0.3.37)
-    uglifier (2.1.1)
+    uglifier (2.1.2)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
     unicorn (4.6.3)
@@ -367,14 +370,14 @@ GEM
     virtus (0.5.5)
       backports (~> 3.3)
       descendants_tracker (~> 0.0.1)
-    warden (1.2.1)
+    warden (1.2.3)
       rack (>= 1.0)
     websocket (1.0.7)
     will_paginate (3.0.4)
     xpath (1.0.0)
       nokogiri (~> 1.3)
     yamler (0.1.0)
-    yard (0.8.6.1)
+    yard (0.8.7)
 
 PLATFORMS
   ruby
@@ -429,7 +432,7 @@ DEPENDENCIES
   query_reviewer
   quiet_assets
   rack-cache
-  rails
+  rails (~> 3.2.6)
   rainbows
   rb-fchange
   rb-fsevent

diff --git a/spec/controllers/ideas_controller_spec.rb b/spec/controllers/ideas_controller_spec.rb
@@ -101,7 +101,7 @@ def it_should_call_mover
         IdeaMoverService.
           should_receive(:new).
           with(hash_including(idea:@idea, account:@other_account)).
-          and_return(stub run:nil)
+          and_return(double run:nil)
       end
 
       def it_should_not_call_mover