285
285
end
286
286
287
287
it "should not set the PUBLIC_ROOT constant" do
288
- lambda { PUBLIC_ROOT } . should raise_error
288
+ expect ( PUBLIC_ROOT ) . to eql ""
289
289
end
290
290
291
291
describe "logger" do
@@ -305,7 +305,7 @@ def logger=(logger); @logger = logger; end
305
305
end
306
306
307
307
it "gets set as config.logger" do
308
- logger = Logger . new STDERR
308
+ logger = JRuby :: Rack :: Logger . new STDERR
309
309
@config . stub ( :log_level ) . and_return ( :info )
310
310
@config . stub ( :log_formatter ) . and_return ( nil )
311
311
@@ -317,18 +317,16 @@ def logger=(logger); @logger = logger; end
317
317
@app . config . logger . should be ( logger )
318
318
end
319
319
320
- it "has a configurable log level and formatter " do
320
+ it "has a configurable log level" do
321
321
@config . instance_eval do
322
322
def logger ; @logger ; end
323
323
def logger = ( logger ) ; @logger = logger ; end
324
324
end
325
325
@config . stub ( :log_formatter ) . and_return ( nil )
326
326
@config . should_receive ( :log_level ) . and_return ( :debug )
327
- @config . should_receive ( :log_formatter ) . and_return ( formatter = Logger ::Formatter . new )
328
327
329
328
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 )
332
330
end
333
331
334
332
it "is wrapped in tagged logging" do # Rails 3.2
@@ -345,7 +343,7 @@ module ::ActiveSupport; end
345
343
346
344
log_initializer . last . call ( @app )
347
345
@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 )
349
347
ensure
350
348
if tagged_logging . nil?
351
349
if active_support
0 commit comments