Skip to content
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.

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

Fix main branch build #205

Merged
merged 3 commits into from
Aug 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions activerecord-session_store.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Gem::Specification.new do |s|
s.add_dependency('railties', '>= 6.1')
s.add_dependency('rack', '>= 2.0.8', '< 3')
s.add_dependency('multi_json', '~> 1.11', '>= 1.11.2')
s.add_dependency('cgi', '>= 0.3.6')

s.add_development_dependency('sqlite3')
end
3 changes: 1 addition & 2 deletions gemfiles/rails_edge.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ git "https://github.com/rails/rails.git", :branch => "main" do
gem "railties"
end

gem "rack", :git => "https://github.com/rack/rack.git", :branch => "main"
gem "rack-session", :git => "https://github.com/rack/rack-session.git", :branch => "main"
gem "rack", "~> 2.0", ">= 2.2.4"

gemspec :path => "../"
2 changes: 1 addition & 1 deletion test/action_controller_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ def test_getting_session_value_after_session_reset
get '/set_session_value'
assert_response :success
assert cookies['_session_id']
session_cookie = cookies.send(:hash_for)['_session_id']
session_cookie = cookies.get_cookie('_session_id')

get '/call_reset_session'
assert_response :success
Expand Down
Loading