Skip to content

Commit d4968b8

Browse files
authored
Merge pull request #346 from ruby/revert-workaround
Removed needless workaround
2 parents 5409e1a + 235964b commit d4968b8

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

test/lib/helper.rb

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
11
require "simplecov"
22

33
# Cannot use ".simplecov" file: simplecov-json triggers a circular require.
4-
begin
5-
require "simplecov-json"
6-
SimpleCov.formatters = SimpleCov::Formatter::MultiFormatter.new([
7-
SimpleCov::Formatter::HTMLFormatter,
8-
SimpleCov::Formatter::JSONFormatter,
9-
])
10-
rescue LoadError
11-
# for `make test-bundled-gems` in ruby-core repository.
12-
# That task does not install C extension gem like json.
13-
end
4+
require "simplecov-json"
5+
SimpleCov.formatters = SimpleCov::Formatter::MultiFormatter.new([
6+
SimpleCov::Formatter::HTMLFormatter,
7+
SimpleCov::Formatter::JSONFormatter,
8+
])
149

1510
SimpleCov.start do
1611
command_name "Net::IMAP tests"

0 commit comments

Comments
 (0)