Permalink
Browse files

Update Rails to 3.2.14 and bundle update

- gems updated: capistrano, mysql2 nokogiri, rspec, shoulda-matchers
- replace the deprecated mock() with double()
  • Loading branch information...
1 parent d36ae0a commit e19a690a49d095000a7c31c203c6b1529b11a948 David Pranata committed Aug 12, 2013
Showing with 56 additions and 54 deletions.
  1. +1 −1 Gemfile
  2. +50 −48 Gemfile.lock
  3. +2 −2 spec/controllers/api/v1/recalls_controller_spec.rb
  4. +3 −3 spec/lib/importers/importer_spec.rb
View
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
-gem 'rails', '3.2.13'
+gem 'rails', '3.2.14'
gem 'rails-api'
gem 'mysql2'
gem 'thin'
View
@@ -1,40 +1,40 @@
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.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)
airbrake (3.1.12)
activesupport
builder
json
arel (3.0.2)
builder (3.0.4)
- capistrano (2.15.4)
+ capistrano (2.15.5)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
@@ -52,25 +52,27 @@ GEM
erubis (2.7.0)
eventmachine (1.0.3)
highline (1.6.19)
- hike (1.2.2)
- i18n (0.6.1)
+ hike (1.2.3)
+ i18n (0.6.4)
journey (1.0.4)
json (1.8.0)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.23)
- multi_json (1.7.4)
- mysql2 (0.3.11)
- net-scp (1.1.1)
+ mini_portile (0.5.1)
+ multi_json (1.7.9)
+ mysql2 (0.3.13)
+ net-scp (1.1.2)
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
- net-ssh (2.6.7)
+ net-ssh (2.6.8)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
- newrelic_rpm (3.6.3.104)
- nokogiri (1.5.9)
+ newrelic_rpm (3.6.6.147)
+ nokogiri (1.6.0)
+ mini_portile (~> 0.5.0)
polyglot (0.3.3)
pr_geohash (1.0.0)
rack (1.4.5)
@@ -82,46 +84,46 @@ 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.14)
rails-api (0.1.0)
actionpack (>= 3.2.11)
railties (>= 3.2.11)
tzinfo (~> 0.3.31)
- railties (3.2.13)
- actionpack (= 3.2.13)
- activesupport (= 3.2.13)
+ railties (3.2.14)
+ actionpack (= 3.2.14)
+ activesupport (= 3.2.14)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
- rake (10.0.4)
+ rake (10.1.0)
rdoc (3.12.2)
json (~> 1.4)
rest-client (1.6.7)
mime-types (>= 1.16)
rsolr (1.0.9)
builder (>= 2.1.2)
- rspec-core (2.13.1)
- rspec-expectations (2.13.0)
+ rspec-core (2.14.4)
+ rspec-expectations (2.14.1)
diff-lcs (>= 1.1.3, < 2.0)
- rspec-mocks (2.13.1)
- rspec-rails (2.13.2)
+ rspec-mocks (2.14.3)
+ 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)
- sanitize (2.0.3)
- nokogiri (>= 1.4.4, < 1.6)
- shoulda-matchers (2.1.0)
+ rspec-core (~> 2.14.0)
+ rspec-expectations (~> 2.14.0)
+ rspec-mocks (~> 2.14.0)
+ sanitize (2.0.6)
+ nokogiri (>= 1.4.4)
+ shoulda-matchers (2.2.0)
activesupport (>= 3.0.0)
simplecov (0.7.1)
multi_json (~> 1.0)
@@ -145,7 +147,7 @@ GEM
rack (>= 1.0.0)
thor (0.18.1)
tilt (1.4.1)
- treetop (1.4.12)
+ treetop (1.4.14)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.37)
@@ -161,7 +163,7 @@ DEPENDENCIES
newrelic_rpm
nokogiri
rack-contrib
- rails (= 3.2.13)
+ rails (= 3.2.14)
rails-api
rake
rspec-rails
@@ -7,7 +7,7 @@
describe '#index' do
context 'when the format is json' do
let(:results_hash) { { total: 1 } }
- let(:search_results) { mock('search results', as_json: results_hash) }
+ let(:search_results) { double('search results', as_json: results_hash) }
before do
RecallSearch.should_receive(:recent).with(page: 2, per_page: 15).and_return(search_results)
@@ -47,7 +47,7 @@
'hl' => '1' }.freeze
end
let(:results_hash) { { total: 1 }.freeze }
- let(:search_results) { mock('search results', as_json: results_hash) }
+ let(:search_results) { double('search results', as_json: results_hash) }
before do
RecallSearch.should_receive(:new).
@@ -9,7 +9,7 @@ class DummyImporter
context 'when the response Location header field is present' do
it 'should return the Location header field value' do
uri = URI('http://www2c.cdc.gov/podcasts/download.asp?af=h&f=8625997')
- response = mock(Net::HTTPFound, code: '302')
+ response = double(Net::HTTPFound, code: '302')
Net::HTTP.should_receive(:get_response).with(uri).and_return(response)
response.should_receive(:get_fields).with('Location').and_return(%w(http://www.fsis.usda.gov/fsis_recalls/RNR_067_2012/index.asp))
DummyImporter.get_url_from_redirect(uri).should == 'http://www.fsis.usda.gov/fsis_recalls/RNR_067_2012/index.asp'
@@ -19,11 +19,11 @@ class DummyImporter
context 'when the response Location header field is not present' do
it 'should return nil' do
uri = URI('http://www2c.cdc.gov/podcasts/download.asp?af=h&f=8625997')
- response = mock(Net::HTTPFound, code: '302')
+ response = double(Net::HTTPFound, code: '302')
Net::HTTP.should_receive(:get_response).with(uri).and_return(response)
response.should_receive(:get_fields).with('Location').and_return(nil)
DummyImporter.get_url_from_redirect(uri).should be_nil
end
end
end
-end
+end

0 comments on commit e19a690

Please sign in to comment.