@@ -137,7 +137,8 @@ module JRuby def call(env) env['rails.session_options'] = @servlet_helper.session_options_for_request(env) - env["RAILS_RELATIVE_URL_ROOT"] = env['java.servlet_request'].getContextPath + env['RAILS_RELATIVE_URL_ROOT'] = env['java.servlet_request'].getContextPath + env['HTTPS'] = 'on' if env['rack.url_scheme'] == 'https' @app.call(env) end end src/main/ruby/jruby/rack/rails.rb @@ -155,17 +155,28 @@ describe JRuby::Rack, "Rails controller extensions" do end describe JRuby::Rack::RailsSetup do + before :each do + @app = mock "app" + @servlet_request = mock "servlet request" + @servlet_request.stub!(:getContextPath).and_return "/blah" + @helper = mock "servlet helper" + @options = mock "options" + @helper.stub!(:session_options_for_request).and_return @options + @rs = JRuby::Rack::RailsSetup.new @app, @helper + @env = {} + @env['java.servlet_request'] = @servlet_request + end + it "should set up the env hash for Rails" do - app = mock "app" - helper = mock "servlet helper" - rs = JRuby::Rack::RailsSetup.new app, helper - options = mock "options" - env = {} - app.should_receive(:call).with(env) - helper.should_receive(:session_options_for_request).and_return options - env['java.servlet_request'] = mock "servlet request" - env['java.servlet_request'].should_receive(:getContextPath).and_return "/blah" - rs.call(env) - env['rails.session_options'].should == options + @app.should_receive(:call).with(@env) + @rs.call(@env) + @env['rails.session_options'].should == @options + end + + it "should set env['HTTPS'] == 'on' if env['rack.url_scheme] == 'https'" do + @app.should_receive(:call).with(@env) + @env['rack.url_scheme'] = 'https' + @rs.call(@env) + @env['HTTPS'].should == 'on' end end src/spec/ruby/jruby/rack/rails_spec.rb 15b34e36e967ed96d4caa2b0eb9c1dc8499117a1 nsieger nsieger@97a6c6ee-731e-0410-87e5-e5612b5efbfe http://github.com/nicksieger/jruby-rack/commit/42877c70c1526d59539c676af32a27424d8d38bb 42877c70c1526d59539c676af32a27424d8d38bb 2008-06-10T21:10:45-07:00 2008-06-10T21:10:45-07:00 set ENV['HTTPS'] = 'on' for Rails depending on servlet request scheme (Lenny Marks) git-svn-id: https://svn.codehaus.org/jruby-contrib/trunk/rack@179 97a6c6ee-731e-0410-87e5-e5612b5efbfe 3579d89f43818fa53008a57cea1a694d8ef4ec40 nsieger nsieger@97a6c6ee-731e-0410-87e5-e5612b5efbfe