|
8 | 8 | require File.expand_path('../../spec_helper', File.dirname(__FILE__)) |
9 | 9 |
|
10 | 10 | 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 | | - |
25 | 11 | require 'rack/adapter/rails' |
26 | 12 |
|
27 | 13 | 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 | | - |
39 | 14 | before :each do |
40 | 15 | allow(ActionController::Base).to receive(:page_cache_extension).and_return ".html" |
41 | 16 | @rails = Rack::Adapter::Rails.new |
@@ -85,7 +60,7 @@ class << @rails |
85 | 60 | expect(@rails.call(@env)).to eq [200, {}, ""] |
86 | 61 | end |
87 | 62 |
|
88 | | -end if defined? ActionController::Base.session_options # :rails23 |
| 63 | +end |
89 | 64 |
|
90 | 65 | require 'rack/adapter/rails_cgi' |
91 | 66 |
|
|
0 commit comments