Skip to content

Commit 1de971a

Browse files
committed
[test] Re-enable possibly accidentally disabled spec
(cherry picked from commit c52919c)
1 parent ae3e653 commit 1de971a

File tree

1 file changed

+1
-26
lines changed

1 file changed

+1
-26
lines changed

src/spec/ruby/rack/adapter/rails_spec.rb

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,34 +8,9 @@
88
require File.expand_path('../../spec_helper', File.dirname(__FILE__))
99

1010
require 'action_controller' if defined? Rails
11-
12-
# if defined? ActionController::Base.session_options # :rails23
13-
# # avoid ArgumentError with real 2.3 (default) middleware-stack :
14-
# # A key is required to write a cookie containing the session data.
15-
# # Use config.action_controller.session = ... in config/environment.rb
16-
# ActionController::Base.session_options.update({
17-
# :key => "_testapp_session", :secret => "some secret phrase" * 42
18-
# })
19-
# else # :stub
20-
# module ActionController
21-
# class Base; end
22-
# end
23-
# end
24-
2511
require 'rack/adapter/rails'
2612

2713
describe 'Rack::Adapter::Rails' do
28-
29-
before :all do
30-
# avoid ArgumentError with real 2.3 (default) middleware-stack :
31-
# A key is required to write a cookie containing the session data.
32-
# Use config.action_controller.session = ... in config/environment.rb
33-
ActionController::Base.session_options.update(
34-
{
35-
:key => "_testapp_session", :secret => "some secret phrase" * 42
36-
})
37-
end
38-
3914
before :each do
4015
allow(ActionController::Base).to receive(:page_cache_extension).and_return ".html"
4116
@rails = Rack::Adapter::Rails.new
@@ -85,7 +60,7 @@ class << @rails
8560
expect(@rails.call(@env)).to eq [200, {}, ""]
8661
end
8762

88-
end if defined? ActionController::Base.session_options # :rails23
63+
end
8964

9065
require 'rack/adapter/rails_cgi'
9166

0 commit comments

Comments
 (0)