Skip to content

[CHORE] Fix Rails 6 deprecations #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 24, 2018
Merged

[CHORE] Fix Rails 6 deprecations #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25a61f0
Fix Rails 6 assert_nil deprecations
maschwenk Jan 13, 2018
554c166
Fix Rails 6 dynamic actions deprecations
maschwenk Jan 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/action_controller_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ def test_doesnt_write_session_cookie_if_session_id_is_already_exists

get '/get_session_value'
assert_response :success
assert_equal nil, headers['Set-Cookie'], "should not resend the cookie again if session_id cookie is already exists"
assert_nil headers['Set-Cookie'], "should not resend the cookie again if session_id cookie is already exists"
end
end

Expand Down
2 changes: 1 addition & 1 deletion test/destroy_session_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def test_destroy_without_renew
s.destroy

renewed_session_model = req.env[record_key]
assert_equal nil, renewed_session_model.data['rails']
assert_nil renewed_session_model.data['rails']
end

def test_destroy_with_renew
Expand Down
3 changes: 2 additions & 1 deletion test/helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,11 @@ def self.build_app(routes = nil)

def with_test_route_set(options = {})
controller_namespace = self.class.to_s.underscore
actions = %w[set_session_value get_session_value call_reset_session renew get_session_id]

with_routing do |set|
set.draw do
get ':action', :controller => "#{controller_namespace}/test"
actions.each { |action| get action, controller: "#{controller_namespace}/test" }
end

@app = self.class.build_app(set) do |middleware|
Expand Down