Update rails to 4.2.7.1

* Update dependencies to fix deprecation warnings
* Fix BoxcarAgent specs (found by rspec warning about expecting `raise_error` without specifying the exception)
This commit is contained in:
Dominik Sander 2016-08-11 20:56:32 +02:00
parent 76c4622bf3
commit fade736381
3 changed files with 75 additions and 75 deletions

View file

@ -112,9 +112,9 @@ gem 'mini_magick'
gem 'multi_xml'
gem 'nokogiri', '1.6.8'
gem 'omniauth'
gem 'rails', '4.2.5.2'
gem 'rails', '4.2.7.1'
gem 'rufus-scheduler', '~> 3.0.8', require: false
gem 'sass-rails', '~> 5.0.3'
gem 'sass-rails', '~> 5.0.6'
gem 'select2-rails', '~> 3.5.4'
gem 'spectrum-rails'
gem 'string-scrub' # for ruby <2.1
@ -149,9 +149,9 @@ group :development do
gem 'pry-rails'
gem 'pry-byebug'
gem 'rr'
gem 'rspec', '~> 3.2'
gem 'rspec', '~> 3.5'
gem 'rspec-collection_matchers', '~> 1.1.0'
gem 'rspec-rails', '~> 3.1'
gem 'rspec-rails', '~> 3.5.1'
gem 'rspec-html-matchers', '~> 0.7'
gem 'shoulda-matchers'
gem 'vcr'

View file

@ -69,36 +69,36 @@ GEM
remote: https://rubygems.org/
specs:
ace-rails-ap (2.0.1)
actionmailer (4.2.5.2)
actionpack (= 4.2.5.2)
actionview (= 4.2.5.2)
activejob (= 4.2.5.2)
actionmailer (4.2.7.1)
actionpack (= 4.2.7.1)
actionview (= 4.2.7.1)
activejob (= 4.2.7.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.5.2)
actionview (= 4.2.5.2)
activesupport (= 4.2.5.2)
actionpack (4.2.7.1)
actionview (= 4.2.7.1)
activesupport (= 4.2.7.1)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.5.2)
activesupport (= 4.2.5.2)
actionview (4.2.7.1)
activesupport (= 4.2.7.1)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
activejob (4.2.5.2)
activesupport (= 4.2.5.2)
activejob (4.2.7.1)
activesupport (= 4.2.7.1)
globalid (>= 0.3.0)
activemodel (4.2.5.2)
activesupport (= 4.2.5.2)
activemodel (4.2.7.1)
activesupport (= 4.2.7.1)
builder (~> 3.1)
activerecord (4.2.5.2)
activemodel (= 4.2.5.2)
activesupport (= 4.2.5.2)
activerecord (4.2.7.1)
activemodel (= 4.2.7.1)
activesupport (= 4.2.7.1)
arel (~> 6.0)
activesupport (4.2.5.2)
activesupport (4.2.7.1)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
@ -155,7 +155,7 @@ GEM
execjs
coffee-script-source (1.10.0)
colorize (0.7.7)
concurrent-ruby (1.0.1)
concurrent-ruby (1.0.2)
cookiejar (0.3.2)
coveralls (0.7.12)
multi_json (~> 1.10)
@ -232,7 +232,7 @@ GEM
geokit-rails (2.0.1)
geokit (~> 1.5)
rails (>= 3.0)
globalid (0.3.6)
globalid (0.3.7)
activesupport (>= 4.1.0)
google-api-client (0.7.1)
addressable (>= 2.3.2)
@ -318,16 +318,16 @@ GEM
lumberjack (1.0.10)
macaddr (1.7.1)
systemu (~> 2.6.2)
mail (2.6.3)
mime-types (>= 1.16, < 3)
mail (2.6.4)
mime-types (>= 1.16, < 4)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
method_source (0.8.2)
mime-types (2.99.1)
mime-types (2.99.2)
mimemagic (0.3.1)
mini_magick (4.2.3)
mini_portile2 (2.1.0)
minitest (5.8.4)
minitest (5.9.0)
mqtt (0.3.1)
multi_json (1.11.2)
multi_xml (0.5.5)
@ -405,16 +405,16 @@ GEM
rack
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.5.2)
actionmailer (= 4.2.5.2)
actionpack (= 4.2.5.2)
actionview (= 4.2.5.2)
activejob (= 4.2.5.2)
activemodel (= 4.2.5.2)
activerecord (= 4.2.5.2)
activesupport (= 4.2.5.2)
rails (4.2.7.1)
actionmailer (= 4.2.7.1)
actionpack (= 4.2.7.1)
actionview (= 4.2.7.1)
activejob (= 4.2.7.1)
activemodel (= 4.2.7.1)
activerecord (= 4.2.7.1)
activesupport (= 4.2.7.1)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.5.2)
railties (= 4.2.7.1)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
@ -429,13 +429,13 @@ GEM
rails_stdout_logging
rails_serve_static_assets (0.0.4)
rails_stdout_logging (0.0.3)
railties (4.2.5.2)
actionpack (= 4.2.5.2)
activesupport (= 4.2.5.2)
railties (4.2.7.1)
actionpack (= 4.2.7.1)
activesupport (= 4.2.7.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.13.0)
rake (10.5.0)
rake (11.2.2)
rb-fsevent (0.9.7)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
@ -448,32 +448,32 @@ GEM
netrc (~> 0.7)
retriable (2.0.2)
rr (1.1.2)
rspec (3.2.0)
rspec-core (~> 3.2.0)
rspec-expectations (~> 3.2.0)
rspec-mocks (~> 3.2.0)
rspec (3.5.0)
rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0)
rspec-mocks (~> 3.5.0)
rspec-collection_matchers (1.1.2)
rspec-expectations (>= 2.99.0.beta1)
rspec-core (3.2.1)
rspec-support (~> 3.2.0)
rspec-expectations (3.2.0)
rspec-core (3.5.2)
rspec-support (~> 3.5.0)
rspec-expectations (3.5.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.2.0)
rspec-support (~> 3.5.0)
rspec-html-matchers (0.7.0)
nokogiri (~> 1)
rspec (~> 3)
rspec-mocks (3.2.1)
rspec-mocks (3.5.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.2.0)
rspec-rails (3.2.1)
actionpack (>= 3.0, < 4.3)
activesupport (>= 3.0, < 4.3)
railties (>= 3.0, < 4.3)
rspec-core (~> 3.2.0)
rspec-expectations (~> 3.2.0)
rspec-mocks (~> 3.2.0)
rspec-support (~> 3.2.0)
rspec-support (3.2.2)
rspec-support (~> 3.5.0)
rspec-rails (3.5.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0)
rspec-mocks (~> 3.5.0)
rspec-support (~> 3.5.0)
rspec-support (3.5.0)
rturk (2.12.1)
erector
nokogiri
@ -484,12 +484,12 @@ GEM
tzinfo
safe_yaml (1.0.4)
sass (3.4.14)
sass-rails (5.0.3)
railties (>= 4.0.0, < 5.0)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (~> 1.1)
tilt (>= 1.1, < 3)
select2-rails (3.5.9.3)
thor (~> 0.14)
shellany (0.0.1)
@ -514,10 +514,10 @@ GEM
spring (1.6.3)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
sprockets (3.5.2)
sprockets (3.7.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.0.3)
sprockets-rails (3.1.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
@ -534,7 +534,7 @@ GEM
ref
thor (0.19.1)
thread_safe (0.3.5)
tilt (1.4.1)
tilt (2.0.5)
tins (1.10.1)
treetop (1.5.3)
polyglot (~> 0.3)
@ -662,17 +662,17 @@ DEPENDENCIES
quiet_assets
rack (> 1.5.0)
rack-livereload (~> 0.3.16)
rails (= 4.2.5.2)
rails (= 4.2.7.1)
rails_12factor
rr
rspec (~> 3.2)
rspec (~> 3.5)
rspec-collection_matchers (~> 1.1.0)
rspec-html-matchers (~> 0.7)
rspec-rails (~> 3.1)
rspec-rails (~> 3.5.1)
rturk (~> 2.12.1)
ruby-growl (~> 4.1.0)
rufus-scheduler (~> 3.0.8)
sass-rails (~> 5.0.3)
sass-rails (~> 5.0.6)
select2-rails (~> 3.5.4)
shoulda-matchers
slack-notifier (~> 1.0.0)
@ -697,4 +697,4 @@ DEPENDENCIES
xmpp4r (~> 0.5.6)
BUNDLED WITH
1.11.2
1.12.5

View file

@ -44,17 +44,17 @@ describe Agents::BoxcarAgent do
it "should raise error when invalid response arrives" do
stub(HTTParty).post { {"blah" => "blah"} }
expect{@checker.send_notification}.to raise_error
expect { @checker.send_notification({}) }.to raise_error(StandardError, /Invalid response from Boxcar:/)
end
it "should raise error when response says unauthorized" do
stub(HTTParty).post '{"Response":"Not authorized"}'
expect{@checker.send_notification}.to raise_error
stub(HTTParty).post { {"Response" => "Not authorized"} }
expect { @checker.send_notification({}) }.to raise_error(StandardError, /Not authorized/)
end
it "should raise error when response has an error" do
stub(HTTParty).post '{"error": {"message": "Sample error"}}'
expect{@checker.send_notification}.to raise_error
stub(HTTParty).post { {"error" => {"message" => "Sample error"}} }
expect { @checker.send_notification({}) }.to raise_error(StandardError, /Sample error/)
end
end
end