Skip to content

Commit

Permalink
Update some dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
antw committed Jan 5, 2018
1 parent 20291f6 commit 1ec5fdf
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 16 deletions.
2 changes: 2 additions & 0 deletions Gemfile
@@ -1,3 +1,5 @@
ruby '2.4.2'

source 'https://rubygems.org'

gem 'rails', '~> 4.1'
Expand Down
34 changes: 19 additions & 15 deletions Gemfile.lock
Expand Up @@ -100,11 +100,11 @@ GEM
compass-rails (2.0.0)
compass (>= 0.12.2)
concurrent-ruby (1.0.5)
crass (1.0.2)
crass (1.0.3)
database_cleaner (1.2.0)
debug_inspector (0.0.2)
default_value_for (3.0.0)
activerecord (>= 3.2.0, < 5.0)
default_value_for (3.0.3)
activerecord (>= 3.2.0, < 5.2)
devise (4.3.0)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
Expand All @@ -122,10 +122,10 @@ GEM
eco-source (1.1.0.rc.1)
erubis (2.7.0)
execjs (2.0.2)
factory_girl (4.4.0)
factory_girl (4.9.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.4.1)
factory_girl (~> 4.4.0)
factory_girl_rails (4.9.0)
factory_girl (~> 4.9.0)
railties (>= 3.0.0)
ffi (1.9.3)
formatador (0.2.4)
Expand All @@ -150,7 +150,7 @@ GEM
hike (1.2.3)
http_accept_language (2.0.1)
httpclient (2.3.4.1)
i18n (0.9.0)
i18n (0.9.1)
concurrent-ruby (~> 1.0)
i18n-js (2.1.2)
i18n
Expand Down Expand Up @@ -183,7 +183,7 @@ GEM
mime-types-data (3.2016.0521)
mini_mime (0.1.4)
mini_portile2 (2.3.0)
minitest (5.10.3)
minitest (5.11.1)
multi_json (1.12.2)
mysql2 (0.3.21)
net-scp (1.2.1)
Expand All @@ -194,10 +194,9 @@ GEM
nokogiri (1.8.1)
mini_portile2 (~> 2.3.0)
orm_adapter (0.5.0)
poltergeist (1.5.0)
poltergeist (1.17.0)
capybara (~> 2.1)
cliver (~> 0.3.1)
multi_json (~> 1.0)
websocket-driver (>= 0.2.0)
polyglot (0.3.5)
pry (0.9.12.6)
Expand Down Expand Up @@ -227,8 +226,8 @@ GEM
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.8)
activesupport (>= 4.2.0.beta, < 5.0)
rails-dom-testing (1.0.9)
activesupport (>= 4.2.0, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
Expand Down Expand Up @@ -309,8 +308,10 @@ GEM
json (>= 1.8.0)
warden (1.2.7)
rack (>= 1.0)
websocket-driver (0.3.2)
xpath (2.0.0)
websocket-driver (0.7.0)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
xpath (2.1.0)
nokogiri (~> 1.3)

PLATFORMS
Expand Down Expand Up @@ -372,5 +373,8 @@ DEPENDENCIES
treetop
uglifier (>= 1.0.3)

RUBY VERSION
ruby 2.4.2p198

BUNDLED WITH
1.15.4
1.16.0
3 changes: 2 additions & 1 deletion spec/controllers/client_controller_spec.rb
Expand Up @@ -115,7 +115,8 @@ def destroy ; respond_with({}) ; end

describe 'client method' do
it 'should not be reachable' do
expect { get :client }.to raise_error(ActionController::RoutingError)
expect { get :client }.
to raise_error(ActionController::UrlGenerationError)
end
end

Expand Down

0 comments on commit 1ec5fdf

Please sign in to comment.