Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 3.1.2
* カバレッジレポートの出力から rcov 形式を削除
* simplecov-rcov は(他の箇所で使っていなければ)不使用になるので、Gemfile から削除してください

## 3.1.1
* ジョブ監査ログに開始時刻と終了時刻を追加

Expand Down
3 changes: 3 additions & 0 deletions bizside_test_app/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,7 @@
/log/*.log
/tmp

# test coverage output dir
/coverage

/Gemfile.lock
3 changes: 1 addition & 2 deletions bizside_test_app/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@ group :test do
gem 'puma'
gem 'rails-controller-testing'
gem 'RedCloth'
gem 'simplecov'
gem 'simplecov-rcov'
gem 'simplecov', require: false
gem 'webmock'
end

Expand Down
2 changes: 2 additions & 0 deletions bizside_test_app/test/test_helper.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
require 'bizside/test_help'

ENV['RAILS_ENV'] ||= 'test'
require File.expand_path('../../config/environment', __FILE__)
require 'rails/test_help'
Expand Down
15 changes: 2 additions & 13 deletions lib/bizside/coverage/launch.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class Launch

def self.load
if ENV["COVERAGE"].to_s.downcase == 'true' and ENV['ACCEPTANCE_TEST'].to_s.downcase == 'true'
setup()
require 'simplecov'

SimpleCov.start 'rails' do
SimpleCov.command_name(ENV['COMMAND_NAME']) if ENV['COMMAND_NAME']
Expand All @@ -15,21 +15,10 @@ def self.load

def self.load_from_test_helper
if ENV["COVERAGE"] == 'true'
setup()
require 'simplecov'
SimpleCov.start 'rails'
end
end

def self.setup
require 'simplecov'
require 'simplecov-rcov'
require_relative 'rcov_formatter'
SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
SimpleCov::Formatter::HTMLFormatter,
Bizside::Coverage::RcovFormatter
])
end
private_class_method :setup
end
end
end
15 changes: 0 additions & 15 deletions lib/bizside/coverage/rcov_formatter.rb

This file was deleted.

2 changes: 1 addition & 1 deletion lib/bizside/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Bizside
VERSION = '3.1.1'
VERSION = '3.1.2'
end