Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport ruby core changes #44

Merged
merged 3 commits into from
Dec 9, 2019
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
2 changes: 1 addition & 1 deletion logger.gemspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
begin
require_relative "lib/logger/version"
rescue LoadError # Fallback to load version file in ruby core repository
require_relative "logger/version"
require_relative "version"
end

Gem::Specification.new do |spec|
Expand Down
9 changes: 7 additions & 2 deletions test/logger/helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
$LOAD_PATH.unshift File.join(ROOT_DIR, 'test', 'lib') # to use custom test-unit in this repo
require 'logger'
require 'test/unit'
require 'core_assertions'

Test::Unit::TestCase.include Test::Unit::CoreAssertions
begin
# for standalone test suite on ruby/logger
require 'core_assertions'

Test::Unit::TestCase.include Test::Unit::CoreAssertions
rescue LoadError
end
2 changes: 1 addition & 1 deletion test/logger/test_logdevice.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def teardown
end

def d(log, opt = {})
Logger::LogDevice.new(log, opt)
Logger::LogDevice.new(log, **opt)
end

def test_initialize
Expand Down