Permalink
Browse files

Upgrade rails to 3.2.13 for security patches

* upgrade shoulda-matchers to work with this version of rails

https://trello.com/c/dmWF5VDI
  • Loading branch information...
1 parent afd9456 commit 90714cf2dedcb463126e60ea8dc90f8bfcd1bb7b @gylaz gylaz committed Apr 2, 2013
Showing with 45 additions and 45 deletions.
  1. +2 −2 Gemfile
  2. +41 −41 Gemfile.lock
  3. +2 −2 spec/models/event_spec.rb
View
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
ruby '2.0.0'
-gem 'rails', '~> 3.2'
+gem 'rails', '>= 3.2.13'
gem 'airbrake', '~> 3.1'
gem 'attr_encrypted'
@@ -50,7 +50,7 @@ group :test do
gem 'factory_girl_rails', '~> 3.0'
gem 'jasmine'
gem 'launchy'
- gem 'shoulda-matchers', '~> 1.4'
+ gem 'shoulda-matchers', '1.5.2'
gem 'simplecov', require: false
gem 'sinatra'
gem 'timecop'
View
@@ -1,32 +1,32 @@
GEM
remote: https://rubygems.org/
specs:
- actionmailer (3.2.12)
- actionpack (= 3.2.12)
- mail (~> 2.4.4)
- actionpack (3.2.12)
- activemodel (= 3.2.12)
- activesupport (= 3.2.12)
+ actionmailer (3.2.13)
+ actionpack (= 3.2.13)
+ mail (~> 2.5.3)
+ actionpack (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
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.12)
- activesupport (= 3.2.12)
+ activemodel (3.2.13)
+ activesupport (= 3.2.13)
builder (~> 3.0.0)
- activerecord (3.2.12)
- activemodel (= 3.2.12)
- activesupport (= 3.2.12)
+ activerecord (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.12)
- activemodel (= 3.2.12)
- activesupport (= 3.2.12)
- activesupport (3.2.12)
- i18n (~> 0.6)
+ activeresource (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
+ activesupport (3.2.13)
+ i18n (= 0.6.1)
multi_json (~> 1.0)
addressable (2.3.3)
airbrake (3.1.8)
@@ -50,8 +50,8 @@ GEM
bourbon (2.1.3)
sass (>= 3.2)
thor
- bourne (1.1.2)
- mocha (= 0.10.5)
+ bourne (1.4.0)
+ mocha (~> 0.13.2)
builder (3.0.4)
capybara (2.0.2)
mime-types (>= 1.16)
@@ -153,18 +153,18 @@ GEM
addressable (~> 2.3)
listen (0.7.3)
lumberjack (1.0.3)
- mail (2.4.4)
+ mail (2.5.3)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mail_view (1.0.3)
tilt
metaclass (0.0.1)
method_source (0.8.1)
- mime-types (1.21)
- mocha (0.10.5)
+ mime-types (1.22)
+ mocha (0.13.3)
metaclass (~> 0.0.1)
- multi_json (1.6.1)
+ multi_json (1.7.2)
multi_xml (0.5.3)
multipart-post (1.1.5)
newrelic_rpm (3.5.6.55)
@@ -204,23 +204,23 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.12)
- actionmailer (= 3.2.12)
- actionpack (= 3.2.12)
- activerecord (= 3.2.12)
- activeresource (= 3.2.12)
- activesupport (= 3.2.12)
+ rails (3.2.13)
+ actionmailer (= 3.2.13)
+ actionpack (= 3.2.13)
+ activerecord (= 3.2.13)
+ activeresource (= 3.2.13)
+ activesupport (= 3.2.13)
bundler (~> 1.0)
- railties (= 3.2.12)
- railties (3.2.12)
- actionpack (= 3.2.12)
- activesupport (= 3.2.12)
+ railties (= 3.2.13)
+ railties (3.2.13)
+ actionpack (= 3.2.13)
+ activesupport (= 3.2.13)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
- rake (10.0.3)
- rdoc (3.12.1)
+ rake (10.0.4)
+ rdoc (3.12.2)
json (~> 1.4)
rspec (2.12.0)
rspec-core (~> 2.12.0)
@@ -250,9 +250,9 @@ GEM
websocket (~> 1.0.4)
sham_rack (1.3.4)
rack
- shoulda-matchers (1.4.2)
+ shoulda-matchers (1.5.2)
activesupport (>= 3.0.0)
- bourne (~> 1.1.2)
+ bourne (~> 1.3)
simplecov (0.7.1)
multi_json (~> 1.0)
simplecov-html (~> 0.7.1)
@@ -290,16 +290,16 @@ GEM
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
- thor (0.17.0)
- tilt (1.3.3)
+ thor (0.18.1)
+ tilt (1.3.6)
timecop (0.5.9.2)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
turnip (1.0.0)
gherkin (>= 2.5)
rspec (~> 2.0)
- tzinfo (0.3.35)
+ tzinfo (0.3.37)
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
@@ -357,12 +357,12 @@ DEPENDENCIES
pg
pry
quiet_assets
- rails (~> 3.2)
+ rails (>= 3.2.13)
rspec-rails
sass
sass-rails (~> 3.2)
sham_rack
- shoulda-matchers (~> 1.4)
+ shoulda-matchers (= 1.5.2)
simplecov
sinatra
sprockets-redirect
@@ -45,7 +45,7 @@
end
end
-describe Event, 'validations'do
+describe Event, 'validations' do
it { expect(subject).to validate_presence_of(:name).with_message(/field is required/) }
it { expect(subject).to ensure_length_of(:name).is_at_most(Event::NAME_MAX_LENGTH) }
it { expect(subject).to validate_presence_of(:user_id) }
@@ -58,7 +58,7 @@
end
end
-describe Event, 'add_errors_if_no_suggestions'do
+describe Event, 'add_errors_if_no_suggestions' do
it 'adds errors if there are no primary suggestions' do
event = create(:event)
event.suggestions.map(&:mark_for_destruction)

0 comments on commit 90714cf

Please sign in to comment.