Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/raven/integrations/rails.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class Rails < ::Rails::Railtie
end
end

config.after_initialize do
config.before_initialize do
Raven.configure do |config|
config.logger ||= ::Rails.logger
config.project_root ||= ::Rails.root
Expand Down
13 changes: 13 additions & 0 deletions spec/raven/integrations/rails_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
Raven.configure do |config|
config.dsn = 'dummy://notaserver'
config.encoding = 'json'
config.logger = nil
end
Rails.env = "production"
TestApp.initialize!
Expand Down Expand Up @@ -35,4 +36,16 @@

expect(event['request']['url']).to eq("http://www.example.com/exception")
end

it "sets Raven.configuration.logger correctly" do
expect(Raven.configuration.logger).to eq(Rails.logger)
end

it "sets Raven.configuration.project_root correctly" do
expect(Raven.configuration.project_root).to eq(Rails.root)
end

it "doesn't clobber a manually configured release" do
expect(Raven.configuration.release).to eq('beta')
end
end
6 changes: 6 additions & 0 deletions spec/support/test_rails_app/app.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ class TestApp < Rails::Application
get "/exception", :to => "hello#exception"
root :to => "hello#world"
end

initializer :configure_release do
Raven.configure do |config|
config.release = 'beta'
end
end
end

class HelloController < ActionController::Base
Expand Down