From d1fa056311081f6777c1a6172cfc396666fbbf14 Mon Sep 17 00:00:00 2001 From: Walt Jones Date: Mon, 7 Feb 2022 09:54:49 -0500 Subject: [PATCH 1/4] rails 5.2 CI, pin sinatra to v2.1.0 --- gemfiles/rails52.gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gemfiles/rails52.gemfile b/gemfiles/rails52.gemfile index 50376749..e8ec916d 100644 --- a/gemfiles/rails52.gemfile +++ b/gemfiles/rails52.gemfile @@ -28,8 +28,8 @@ end gem 'sucker_punch', '~> 2.0' -# We need last sinatra that uses rack 2.x -gem 'sinatra', :git => 'https://github.com/sinatra/sinatra' +# We need last sinatra that uses rack 2.x and ruby 2.5.x +gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag =>'v2.1.0' gem 'codacy-coverage' gem 'database_cleaner' From 2947e7f944c7126e45cdcbfb0982f8a6716c5a65 Mon Sep 17 00:00:00 2001 From: Walt Jones Date: Mon, 7 Feb 2022 10:10:23 -0500 Subject: [PATCH 2/4] rails 6.x CI, pin sinatra to v2.1.0 --- gemfiles/rails60.gemfile | 4 ++-- gemfiles/rails61.gemfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gemfiles/rails60.gemfile b/gemfiles/rails60.gemfile index 62a3d13a..7a44c43e 100644 --- a/gemfiles/rails60.gemfile +++ b/gemfiles/rails60.gemfile @@ -24,8 +24,8 @@ end gem 'sucker_punch', '~> 2.0' -# We need last sinatra that uses rack 2.x -gem 'sinatra', :git => 'https://github.com/sinatra/sinatra' +# We need last sinatra that uses rack 2.x and ruby 2.5.x +gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag =>'v2.1.0' gem 'codacy-coverage' gem 'database_cleaner' diff --git a/gemfiles/rails61.gemfile b/gemfiles/rails61.gemfile index 58820b0f..3af14f84 100644 --- a/gemfiles/rails61.gemfile +++ b/gemfiles/rails61.gemfile @@ -24,8 +24,8 @@ end gem 'sucker_punch', '~> 2.0' -# We need last sinatra that uses rack 2.x -gem 'sinatra', :git => 'https://github.com/sinatra/sinatra' +# We need last sinatra that uses rack 2.x and ruby 2.5.x +gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag =>'v2.1.0' gem 'codacy-coverage' gem 'database_cleaner' From 84bffe6252326e8ad357c2a5942ff5cd839ad874 Mon Sep 17 00:00:00 2001 From: Walt Jones Date: Mon, 7 Feb 2022 10:41:48 -0500 Subject: [PATCH 3/4] use explicit hash syntax in method arguments --- spec/rollbar/plugins/sidekiq_spec.rb | 2 +- spec/rollbar_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/rollbar/plugins/sidekiq_spec.rb b/spec/rollbar/plugins/sidekiq_spec.rb index 8ee2d167..22439ac5 100644 --- a/spec/rollbar/plugins/sidekiq_spec.rb +++ b/spec/rollbar/plugins/sidekiq_spec.rb @@ -64,7 +64,7 @@ it 'constructs scope from msg' do allow(rollbar).to receive(:error) expect(Rollbar).to receive(:scope).with( - :framework => "Sidekiq: #{Sidekiq::VERSION}" + { :framework => "Sidekiq: #{Sidekiq::VERSION}" } ) { rollbar } described_class.handle_exception(msg, exception) diff --git a/spec/rollbar_spec.rb b/spec/rollbar_spec.rb index 525af1ab..ebe004f9 100644 --- a/spec/rollbar_spec.rb +++ b/spec/rollbar_spec.rb @@ -1812,9 +1812,9 @@ def backtrace describe '#use_sidekiq', :if => defined?(Sidekiq) do it 'should instanciate sidekiq delayer with custom values' do - Rollbar::Delay::Sidekiq.should_receive(:new).with('queue' => 'test_queue') + Rollbar::Delay::Sidekiq.should_receive(:new).with({ 'queue' => 'test_queue' }) config = Rollbar::Configuration.new - config.use_sidekiq 'queue' => 'test_queue' + config.use_sidekiq({ 'queue' => 'test_queue' }) end it 'should send the payload to sidekiq delayer' do From b6e3dc949a0f4e4d0d0f4ac0e7d0c1663b1380fb Mon Sep 17 00:00:00 2001 From: Walt Jones Date: Mon, 7 Feb 2022 13:47:41 -0500 Subject: [PATCH 4/4] remove codacy integration --- Gemfile | 1 - gemfiles/rails30.gemfile | 1 - gemfiles/rails31.gemfile | 1 - gemfiles/rails32.gemfile | 1 - gemfiles/rails40.gemfile | 1 - gemfiles/rails41.gemfile | 1 - gemfiles/rails42.gemfile | 1 - gemfiles/rails50.gemfile | 1 - gemfiles/rails51.gemfile | 1 - gemfiles/rails52.gemfile | 1 - gemfiles/rails60.gemfile | 1 - gemfiles/rails61.gemfile | 1 - spec/spec_helper.rb | 8 +------- 13 files changed, 1 insertion(+), 19 deletions(-) diff --git a/Gemfile b/Gemfile index 0bfc25f4..9f6365bb 100644 --- a/Gemfile +++ b/Gemfile @@ -43,7 +43,6 @@ platforms :rbx do end gem 'capistrano', :require => false -gem 'codacy-coverage' gem 'shoryuken' gem 'simplecov' gem 'sucker_punch', '~> 2.0' diff --git a/gemfiles/rails30.gemfile b/gemfiles/rails30.gemfile index 4877bee1..4880eb8a 100644 --- a/gemfiles/rails30.gemfile +++ b/gemfiles/rails30.gemfile @@ -28,7 +28,6 @@ platforms :rbx do end gem 'capistrano', :require => false -gem 'codacy-coverage' gem 'rexml', '<= 3.2.4' gem 'shoryuken' gem 'simplecov', '<= 0.17.1' diff --git a/gemfiles/rails31.gemfile b/gemfiles/rails31.gemfile index 1a6fc151..dc1282c6 100644 --- a/gemfiles/rails31.gemfile +++ b/gemfiles/rails31.gemfile @@ -27,7 +27,6 @@ platforms :rbx do end gem 'capistrano', :require => false -gem 'codacy-coverage' gem 'rexml', '<= 3.2.4' gem 'shoryuken' gem 'simplecov', '<= 0.17.1' diff --git a/gemfiles/rails32.gemfile b/gemfiles/rails32.gemfile index 27c2ef1f..49264e6a 100644 --- a/gemfiles/rails32.gemfile +++ b/gemfiles/rails32.gemfile @@ -29,7 +29,6 @@ platforms :rbx do end gem 'capistrano', :require => false -gem 'codacy-coverage' gem 'rexml', '<= 3.2.4' gem 'shoryuken' gem 'simplecov', '<= 0.17.1' diff --git a/gemfiles/rails40.gemfile b/gemfiles/rails40.gemfile index 34506f92..ddbd075b 100644 --- a/gemfiles/rails40.gemfile +++ b/gemfiles/rails40.gemfile @@ -29,7 +29,6 @@ platforms :rbx do end gem 'capistrano', :require => false -gem 'codacy-coverage' gem 'json', '~> 2.0' gem 'shoryuken' gem 'simplecov', '<= 0.17.1' diff --git a/gemfiles/rails41.gemfile b/gemfiles/rails41.gemfile index 2b2cf2b2..a842c0a1 100644 --- a/gemfiles/rails41.gemfile +++ b/gemfiles/rails41.gemfile @@ -26,7 +26,6 @@ platforms :rbx do end gem 'capistrano', :require => false -gem 'codacy-coverage' gem 'shoryuken' gem 'simplecov', '<= 0.17.1' gem 'sucker_punch', '~> 2.0' diff --git a/gemfiles/rails42.gemfile b/gemfiles/rails42.gemfile index 63e572ad..79972c3a 100644 --- a/gemfiles/rails42.gemfile +++ b/gemfiles/rails42.gemfile @@ -40,7 +40,6 @@ gem 'sinatra' gem 'nokogiri', '~> 1.6.0' if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('2.0') -gem 'codacy-coverage' gem 'simplecov', '<= 0.17.1' gem 'sucker_punch', '~> 2.0' gem 'webmock', :require => false diff --git a/gemfiles/rails50.gemfile b/gemfiles/rails50.gemfile index 2526a237..f8c29d51 100644 --- a/gemfiles/rails50.gemfile +++ b/gemfiles/rails50.gemfile @@ -29,7 +29,6 @@ platforms :rbx do end gem 'capistrano', :require => false -gem 'codacy-coverage' gem 'simplecov', '<= 0.17.1' gem 'sucker_punch', '~> 2.0' diff --git a/gemfiles/rails51.gemfile b/gemfiles/rails51.gemfile index 1ceddcfa..d36180ef 100644 --- a/gemfiles/rails51.gemfile +++ b/gemfiles/rails51.gemfile @@ -29,7 +29,6 @@ platforms :rbx do end gem 'capistrano', :require => false -gem 'codacy-coverage' gem 'simplecov', '<= 0.17.1' gem 'sucker_punch', '~> 2.0' diff --git a/gemfiles/rails52.gemfile b/gemfiles/rails52.gemfile index e8ec916d..c453dabe 100644 --- a/gemfiles/rails52.gemfile +++ b/gemfiles/rails52.gemfile @@ -31,7 +31,6 @@ gem 'sucker_punch', '~> 2.0' # We need last sinatra that uses rack 2.x and ruby 2.5.x gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag =>'v2.1.0' -gem 'codacy-coverage' gem 'database_cleaner' gem 'delayed_job', :require => false gem 'generator_spec' diff --git a/gemfiles/rails60.gemfile b/gemfiles/rails60.gemfile index 7a44c43e..633f73dd 100644 --- a/gemfiles/rails60.gemfile +++ b/gemfiles/rails60.gemfile @@ -27,7 +27,6 @@ gem 'sucker_punch', '~> 2.0' # We need last sinatra that uses rack 2.x and ruby 2.5.x gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag =>'v2.1.0' -gem 'codacy-coverage' gem 'database_cleaner' gem 'delayed_job', '4.1.9', :require => false gem 'generator_spec' diff --git a/gemfiles/rails61.gemfile b/gemfiles/rails61.gemfile index 3af14f84..c429f358 100644 --- a/gemfiles/rails61.gemfile +++ b/gemfiles/rails61.gemfile @@ -27,7 +27,6 @@ gem 'sucker_punch', '~> 2.0' # We need last sinatra that uses rack 2.x and ruby 2.5.x gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag =>'v2.1.0' -gem 'codacy-coverage' gem 'database_cleaner' gem 'delayed_job', '4.1.9', :require => false gem 'generator_spec' diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 5f0584be..a81c1cdf 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,19 +1,13 @@ begin require 'simplecov' - require 'codacy-coverage' SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[ - SimpleCov::Formatter::HTMLFormatter, - Codacy::Formatter + SimpleCov::Formatter::HTMLFormatter ] SimpleCov.start do add_filter '/spec/' end - - # Skip Codacy when running locally, to display the Simplecov summary in the console - # and write an updated coverage/index.html - Codacy::Reporter.start if Codacy::Formatter.new.send :should_run? rescue LoadError # Skip loading end