Skip to content

Commit

Permalink
add one more test
Browse files Browse the repository at this point in the history
  • Loading branch information
@rokob
rokob committed May 5, 2017
1 parent e3a890b commit aa96d4f
Show file tree
Hide file tree
Showing 10 changed files with 57 additions and 10 deletions.
7 changes: 6 additions & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,12 @@ gem 'rspec-rails', '~> 3.4'
gem 'sqlite3', :platform => [:ruby, :mswin, :mingw]

gem 'oj', '~> 2.12.14' unless is_jruby
gem 'sidekiq', '>= 2.13.0' if RUBY_VERSION != '1.8.7'

if RUBY_VERSION > '1.8.7' && RUBY_VERSION < '2.2.2'
gem 'sidekiq', '>= 2.13.0', '< 5.0'
else
gem 'sidekiq', '>= 2.13.0'
end

platforms :rbx do
gem 'minitest'
Expand Down
8 changes: 7 additions & 1 deletion gemfiles/rails30.gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,13 @@ gem 'rspec-rails', '>= 2.14.0'
gem 'celluloid', '< 0.17.0' if RUBY_VERSION == '1.9.2'

gem 'oj', '~> 2.12.14' unless is_jruby
gem 'sidekiq', '>= 2.13.0' if RUBY_VERSION != '1.8.7'
if RUBY_VERSION > '1.8.7'
if RUBY_VERSION < '2.2.2'
gem 'sidekiq', '>= 2.13.0', '< 5.0'
else
gem 'sidekiq', '>= 2.13.0'
end
end

platforms :rbx do
gem 'minitest'
Expand Down
6 changes: 5 additions & 1 deletion gemfiles/rails31.gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,11 @@ if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0')
gem 'sidekiq', '< 2.13.0'
else
gem 'webmock', :require => false
gem 'sidekiq', '>= 2.13.0'
if RUBY_VERSION < '2.2.2'
gem 'sidekiq', '>= 2.13.0', '< 5.0'
else
gem 'sidekiq', '>= 2.13.0'
end
end

gem 'resque'
Expand Down
6 changes: 5 additions & 1 deletion gemfiles/rails32.gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@ gem 'sqlite3', :platform => [:ruby, :mswin, :mingw]
gem 'test-unit'

gem 'oj', '~> 2.12.14' unless is_jruby
gem 'sidekiq', '>= 2.13.0' if RUBY_VERSION != '1.8.7'
if RUBY_VERSION > '1.8.7' && RUBY_VERSION < '2.2.2'
gem 'sidekiq', '>= 2.13.0', '< 5.0'
else
gem 'sidekiq', '>= 2.13.0'
end

platforms :rbx do
gem 'minitest'
Expand Down
6 changes: 5 additions & 1 deletion gemfiles/rails40.gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@ gem 'sqlite3', :platform => [:ruby, :mswin, :mingw]
gem 'test-unit'

gem 'oj', '~> 2.12.14' unless is_jruby
gem 'sidekiq', '>= 2.13.0' if RUBY_VERSION != '1.8.7'
if RUBY_VERSION > '1.8.7' && RUBY_VERSION < '2.2.2'
gem 'sidekiq', '>= 2.13.0', '< 5.0'
else
gem 'sidekiq', '>= 2.13.0'
end

platforms :rbx do
gem 'minitest'
Expand Down
6 changes: 5 additions & 1 deletion gemfiles/rails41.gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@ gem 'rspec-rails', '~> 3.4'
gem 'sqlite3', :platform => [:ruby, :mswin, :mingw]

gem 'oj', '~> 2.12.14' unless is_jruby
gem 'sidekiq', '>= 2.13.0' if RUBY_VERSION != '1.8.7'
if RUBY_VERSION > '1.8.7' && RUBY_VERSION < '2.2.2'
gem 'sidekiq', '>= 2.13.0', '< 5.0'
else
gem 'sidekiq', '>= 2.13.0'
end

platforms :rbx do
gem 'minitest'
Expand Down
6 changes: 5 additions & 1 deletion gemfiles/rails42.gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@ gem 'rake'
gem 'rspec-rails', '~> 3.4'
gem 'sqlite3', :platform => [:ruby, :mswin, :mingw]

gem 'sidekiq', '>= 2.13.0' if RUBY_VERSION != '1.8.7'
if RUBY_VERSION > '1.8.7' && RUBY_VERSION < '2.2.2'
gem 'sidekiq', '>= 2.13.0', '< 5.0'
else
gem 'sidekiq', '>= 2.13.0'
end

platforms :rbx do
gem 'minitest'
Expand Down
6 changes: 5 additions & 1 deletion gemfiles/rails50.gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@ gem 'rspec-mocks', '~> 3.5.0.beta3'
gem 'rake'

gem 'oj', '~> 2.12.14' unless is_jruby
gem 'sidekiq', '>= 2.13.0' if RUBY_VERSION != '1.8.7'
if RUBY_VERSION > '1.8.7' && RUBY_VERSION < '2.2.2'
gem 'sidekiq', '>= 2.13.0', '< 5.0'
else
gem 'sidekiq', '>= 2.13.0'
end

platforms :rbx do
gem 'minitest'
Expand Down
6 changes: 4 additions & 2 deletions gemfiles/ruby_1_8_and_1_9_2.gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_

gem 'appraisal', '= 1.0.2'
gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
gem 'celluloid', '< 0.17.0' if RUBY_VERSION == '1.9.2'
gem 'hitimes', '< 1.2.2'
gem 'jruby-openssl', :platform => :jruby
gem 'rails', '3.0.20'
Expand All @@ -15,7 +14,9 @@ gem 'rspec-rails', '>= 2.14.0'
gem 'sqlite3', :platform => [:ruby, :mswin, :mingw]

gem 'oj', '~> 2.12.14' unless is_jruby
gem 'sidekiq', '>= 2.13.0' if RUBY_VERSION != '1.8.7'
if RUBY_VERSION > '1.8.7' && RUBY_VERSION < '2.2.2'
gem 'sidekiq', '>= 2.13.0', '< 5.0'
end

platforms :rbx do
gem 'minitest'
Expand All @@ -25,6 +26,7 @@ platforms :rbx do
end

if RUBY_VERSION.start_with?('1.9')
gem 'celluloid', '< 0.17.0'
gem 'sucker_punch', '~> 1.0'
elsif RUBY_VERSION.start_with?('2')
gem 'sucker_punch', '~> 2.0'
Expand Down
10 changes: 10 additions & 0 deletions spec/rollbar_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,16 @@

Rollbar.error(exception)
end

it 'should not use the filters if overriden at log site' do
Rollbar.configure do |config|
config.exception_level_filters = { 'NameError' => 'ignore' }
end

Rollbar.error(exception, :use_exception_level_filters => false)

expect(Rollbar.last_report[:level]).to be_eql('error')
end
end
end

Expand Down

0 comments on commit aa96d4f

Please sign in to comment.