Fix CI/test dependency issues

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'

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'

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'

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'

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'

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'

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

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'
 

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'
 

gemfiles/rails52.gemfile

@@ -28,10 +28,9 @@ 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'
 gem 'delayed_job', :require => false
 gem 'generator_spec'

gemfiles/rails60.gemfile

@@ -24,10 +24,9 @@ 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'
 gem 'delayed_job', '4.1.9', :require => false
 gem 'generator_spec'

gemfiles/rails61.gemfile

@@ -24,10 +24,9 @@ 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'
 gem 'delayed_job', '4.1.9', :require => false
 gem 'generator_spec'

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)

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

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