Skip to content

Commit

Permalink
Upgrade Rails to 6.0.2.2 and fix deprecations
Browse files Browse the repository at this point in the history
  • Loading branch information
Brian Butz authored and textbook committed May 12, 2020
1 parent c9bf048 commit 36c5ec8
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 11 deletions.
2 changes: 1 addition & 1 deletion api/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ source 'https://rubygems.org'

ruby '2.6.3'

gem 'rails', '>= 5.2.4.2'
gem 'rails', '>= 6.0.2.2'

gem 'activeadmin', '>= 2.2.0'
gem 'addressable'
Expand Down
10 changes: 4 additions & 6 deletions api/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,8 @@ GEM
railties (>= 5.0, < 6.1)
responders (>= 2, < 4)
jaro_winkler (1.5.2)
jbuilder (2.8.0)
activesupport (>= 4.2.0)
multi_json (>= 1.2)
jbuilder (2.10.0)
activesupport (>= 5.0.0)
jquery-rails (4.3.5)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
Expand Down Expand Up @@ -167,7 +166,6 @@ GEM
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.14.0)
multi_json (1.13.1)
mysql2 (0.5.2)
netrc (0.11.0)
nio4r (2.5.2)
Expand Down Expand Up @@ -200,7 +198,7 @@ GEM
nio4r (~> 2.0)
rack (2.2.2)
rack-cors (1.1.1)
rack (>= 1.6.0)
rack (>= 2.0.0)
rack-ssl (1.4.1)
rack
rack-test (1.1.0)
Expand Down Expand Up @@ -352,7 +350,7 @@ DEPENDENCIES
puma (>= 3.12.4)
rack-cors (>= 1.0.5)
rack-ssl
rails (>= 5.2.4.2)
rails (>= 6.0.2.2)
redis (~> 3.3.3)
rest-client
rspec-rails (>= 3.8.2)
Expand Down
1 change: 0 additions & 1 deletion api/spec/rails_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
require 'request_spec_helper'
require 'rspec/rails'
require 'shoulda/matchers'
require 'action_cable/testing/rspec'

# Add additional requires below this line. Rails is not loaded until this point!

Expand Down
2 changes: 1 addition & 1 deletion api/spec/requests/archives_request_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
get retro_archive_path(wrong_retro, archive), as: :json

expect(response).to be_forbidden
expect(response.content_type).to eq('application/json')
expect(response.media_type).to eq('application/json')

expect(JSON.parse(response.body)).to eq({})
end
Expand Down
2 changes: 1 addition & 1 deletion api/spec/requests/item_request_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@
do_request

expect(response).to have_http_status(:not_found)
expect(response.content_type).to eq('application/json')
expect(response.media_type).to eq('application/json')

expect(JSON.parse(response.body)).to eq({})
end
Expand Down
2 changes: 1 addition & 1 deletion api/spec/requests/retros_request_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@
get "/api/retros/#{retro.id}", headers: headers, as: :json

expect(response).to have_http_status(:not_found)
expect(response.content_type).to eq('application/json')
expect(response.media_type).to eq('application/json')

expect(JSON.parse(response.body)).to eq({})
end
Expand Down

0 comments on commit 36c5ec8

Please sign in to comment.