Skip to content

Commit

Permalink
Merge 26ef3a6 into f5f1c10
Browse files Browse the repository at this point in the history
  • Loading branch information
jmalcic committed Jan 23, 2021
2 parents f5f1c10 + 26ef3a6 commit c4caf8e
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 16 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,3 +86,8 @@ jobs:
run: bundle exec rails db:setup
- name: Test with Rake
run: bundle exec rake
- name: Coveralls GitHub Action
uses: coverallsapp/github-action@v1.1.2
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
path-to-lcov: "./coverage/lcov/spina-admin-conferences.lcov"
13 changes: 2 additions & 11 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,6 @@ GEM
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.1.8)
coveralls_reborn (0.20.0)
simplecov (>= 0.18.1, < 0.22.0)
term-ansicolor (~> 1.6)
thor (>= 0.20.3, < 2.0)
tins (~> 1.16)
crass (1.0.6)
docile (1.3.5)
dotenv (2.7.6)
Expand Down Expand Up @@ -287,6 +282,7 @@ GEM
simplecov-html (~> 0.11)
simplecov_json_formatter (~> 0.1)
simplecov-html (0.12.3)
simplecov-lcov (0.8.0)
simplecov_json_formatter (0.1.2)
spina (1.2.0)
ancestry
Expand All @@ -311,14 +307,9 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sync (0.5.0)
temple (0.8.2)
term-ansicolor (1.7.1)
tins (~> 1.0)
thor (1.1.0)
tilt (2.0.10)
tins (1.28.0)
sync
turbolinks (5.2.1)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
Expand Down Expand Up @@ -346,7 +337,6 @@ PLATFORMS

DEPENDENCIES
capybara (~> 3.33)
coveralls_reborn (~> 0.18)
dotenv-rails (~> 2.7)
image_processing (~> 1.12)
minitest-rails (~> 6.0)
Expand All @@ -359,6 +349,7 @@ DEPENDENCIES
rubocop-rails (~> 2.8)
selenium-webdriver (~> 3.142)
simplecov (~> 0.19)
simplecov-lcov (~> 0.8)
spina-admin-conferences!
web-console (~> 4.0)
webdrivers (~> 4.4)
Expand Down
2 changes: 1 addition & 1 deletion spina-admin-conferences.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
spec.add_dependency 'spina', '~> 1.1'

spec.add_development_dependency 'capybara', '~> 3.33'
spec.add_development_dependency 'coveralls_reborn', '~> 0.18'
spec.add_development_dependency 'dotenv-rails', '~> 2.7'
spec.add_development_dependency 'image_processing', '~> 1.12'
spec.add_development_dependency 'minitest-rails', '~> 6.0'
Expand All @@ -43,6 +42,7 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
spec.add_development_dependency 'rubocop-rails', '~> 2.8'
spec.add_development_dependency 'selenium-webdriver', '~> 3.142'
spec.add_development_dependency 'simplecov', '~> 0.19'
spec.add_development_dependency 'simplecov-lcov', '~> 0.8'
spec.add_development_dependency 'web-console', '~> 4.0'
spec.add_development_dependency 'webdrivers', '~> 4.4'
end
10 changes: 6 additions & 4 deletions test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,20 @@
require 'simplecov'

if ENV['CI']
require 'coveralls'
require 'simplecov-lcov'

SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new [SimpleCov::Formatter::HTMLFormatter, Coveralls::SimpleCov::Formatter]
SimpleCov::Formatter::LcovFormatter.config do |config|
config.report_with_single_file = true
end

SimpleCov.formatter = SimpleCov::Formatter::LcovFormatter
end

SimpleCov.start 'rails' do
enable_coverage :branch
add_group 'Validators', 'app/validators'
end

Coveralls.wear!('rails') if ENV['CI']

require 'minitest/mock'
require 'minitest/reporters'

Expand Down

0 comments on commit c4caf8e

Please sign in to comment.