diff --git a/.github/workflows/ruby.yml b/.github/workflows/build.yml similarity index 86% rename from .github/workflows/ruby.yml rename to .github/workflows/build.yml index 631ab17f..09c3512a 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: Ruby +name: Build on: [push, pull_request] @@ -42,3 +42,8 @@ jobs: - name: rubocop run: | bundle exec rubocop + + - name: Coveralls + uses: coverallsapp/github-action@master + with: + github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.simplecov b/.simplecov index 8d212f44..71e854ca 100644 --- a/.simplecov +++ b/.simplecov @@ -1,4 +1,18 @@ + +if ENV['GITHUB_ACTION'] + require 'simplecov-lcov' + + SimpleCov::Formatter::LcovFormatter.config do |c| + c.single_report_path = 'coverage/lcov.info' + c.report_with_single_file = true + end + + SimpleCov.formatter = SimpleCov::Formatter::LcovFormatter +end + SimpleCov.start do + enable_coverage :branch # Only supported for Ruby >= 2.5 + add_filter '/spec/' add_filter 'helper' end \ No newline at end of file diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index e8be3d65..00000000 --- a/.travis.yml +++ /dev/null @@ -1,14 +0,0 @@ -language: ruby -sudo: false -cache: bundler -rvm: - - 2.4.9 - - 2.5.7 - - 2.6.5 - - 2.7.0 -script: - - bundle exec rubocop - - bundle exec rspec -notifications: - email: - - team@wpscan.org diff --git a/README.md b/README.md index b9472fa2..705694e8 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 27d4d607..f529dd33 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -2,15 +2,10 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib')) -require 'simplecov' # Used filters are in /.simplecov +require 'simplecov' # More config is defined in ./.simplecov require 'rspec/its' require 'webmock/rspec' -if ENV['TRAVIS'] - require 'coveralls' - SimpleCov.formatter = Coveralls::SimpleCov::Formatter -end - # See http://betterspecs.org/ RSpec.configure do |config| config.expect_with :rspec do |c| diff --git a/wpscan.gemspec b/wpscan.gemspec index a71f6b78..47f33017 100644 --- a/wpscan.gemspec +++ b/wpscan.gemspec @@ -24,14 +24,14 @@ Gem::Specification.new do |s| s.add_dependency 'cms_scanner', '~> 0.8.2' s.add_development_dependency 'bundler', '>= 1.6' - s.add_development_dependency 'coveralls', '~> 0.8.0' s.add_development_dependency 'memory_profiler', '~> 0.9.13' s.add_development_dependency 'rake', '~> 13.0' s.add_development_dependency 'rspec', '~> 3.9.0' s.add_development_dependency 'rspec-its', '~> 1.3.0' s.add_development_dependency 'rubocop', '~> 0.80.0' s.add_development_dependency 'rubocop-performance', '~> 1.5.0' - s.add_development_dependency 'simplecov', '~> 0.16.1' + s.add_development_dependency 'simplecov', '~> 0.18.2' + s.add_development_dependency 'simplecov-lcov', '~> 0.8.0' s.add_development_dependency 'stackprof', '~> 0.2.12' s.add_development_dependency 'webmock', '~> 3.8.0' end