285285 end
286286
287287 it "should not set the PUBLIC_ROOT constant" do
288- lambda { PUBLIC_ROOT } . should raise_error
288+ expect ( PUBLIC_ROOT ) . to eql ""
289289 end
290290
291291 describe "logger" do
@@ -305,7 +305,7 @@ def logger=(logger); @logger = logger; end
305305 end
306306
307307 it "gets set as config.logger" do
308- logger = Logger . new STDERR
308+ logger = JRuby :: Rack :: Logger . new STDERR
309309 @config . stub ( :log_level ) . and_return ( :info )
310310 @config . stub ( :log_formatter ) . and_return ( nil )
311311
@@ -317,18 +317,16 @@ def logger=(logger); @logger = logger; end
317317 @app . config . logger . should be ( logger )
318318 end
319319
320- it "has a configurable log level and formatter " do
320+ it "has a configurable log level" do
321321 @config . instance_eval do
322322 def logger ; @logger ; end
323323 def logger = ( logger ) ; @logger = logger ; end
324324 end
325325 @config . stub ( :log_formatter ) . and_return ( nil )
326326 @config . should_receive ( :log_level ) . and_return ( :debug )
327- @config . should_receive ( :log_formatter ) . and_return ( formatter = Logger ::Formatter . new )
328327
329328 log_initializer . last . call ( @app ) ##
330- @app . config . logger . level . should be ( Logger ::DEBUG )
331- @app . config . logger . formatter . should be ( formatter )
329+ @app . config . logger . level . should be ( JRuby ::Rack ::Logger ::DEBUG )
332330 end
333331
334332 it "is wrapped in tagged logging" do # Rails 3.2
@@ -345,7 +343,7 @@ module ::ActiveSupport; end
345343
346344 log_initializer . last . call ( @app )
347345 @app . config . logger . should be_a ( klass )
348- @app . config . logger . instance_variable_get ( :@logger ) . should be_a ( Logger )
346+ @app . config . logger . instance_variable_get ( :@logger ) . should be_a ( JRuby :: Rack :: Logger )
349347 ensure
350348 if tagged_logging . nil?
351349 if active_support
0 commit comments