Skip to content

Commit 2082e1d

Browse files
authored
Merge pull request #205 from TobiasBales/fix-main-branch
Fix main branch build
2 parents 9198a95 + f08f307 commit 2082e1d

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

activerecord-session_store.gemspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
2424
s.add_dependency('railties', '>= 6.1')
2525
s.add_dependency('rack', '>= 2.0.8', '< 3')
2626
s.add_dependency('multi_json', '~> 1.11', '>= 1.11.2')
27+
s.add_dependency('cgi', '>= 0.3.6')
2728

2829
s.add_development_dependency('sqlite3')
2930
end

gemfiles/rails_edge.gemfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ git "https://github.com/rails/rails.git", :branch => "main" do
66
gem "railties"
77
end
88

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

1211
gemspec :path => "../"

test/action_controller_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ def test_getting_session_value_after_session_reset
127127
get '/set_session_value'
128128
assert_response :success
129129
assert cookies['_session_id']
130-
session_cookie = cookies.send(:hash_for)['_session_id']
130+
session_cookie = cookies.get_cookie('_session_id')
131131

132132
get '/call_reset_session'
133133
assert_response :success

0 commit comments

Comments
 (0)