Skip to content

Commit 6ea8e40

Browse files
author
Kevin Paulisse
committed
Delete logger, don't nil it
1 parent 8c377ad commit 6ea8e40

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

lib/octocatalog-diff/api/v1/common.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ def self.logger_from_options(options)
1212
logger = options[:logger] || Logger.new(StringIO.new)
1313

1414
# We can't keep :logger in the options due to marshal/unmarshal as part of parallelization.
15-
pass_opts = options.merge(logger: nil)
15+
pass_opts = options.dup
16+
pass_opts.delete(:logger)
1617

1718
# Return cleaned options and logger
1819
[pass_opts, logger]

spec/octocatalog-diff/tests/api/v1/common_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@
1313
options = { logger: logger, foo: 'bar' }
1414
result_opts, result_logger = described_class.logger_from_options(options)
1515
expect(result_logger).to eq(logger)
16-
expect(result_opts).to eq(foo: 'bar', logger: nil)
16+
expect(result_opts).to eq(foo: 'bar')
1717
end
1818

1919
it 'should construct a logger if one is not passed in' do
2020
result_opts, result_logger = described_class.logger_from_options(foo: 'bar')
2121
expect(result_logger).to be_a_kind_of(Logger)
22-
expect(result_opts).to eq(foo: 'bar', logger: nil)
22+
expect(result_opts).to eq(foo: 'bar')
2323
end
2424

2525
it 'should remove logger from options passed to catalogs class' do
2626
logger, _logger_str = OctocatalogDiff::Spec.setup_logger
2727
options = { foo: 'bar', logger: logger }
2828
result_opts, result_logger = described_class.logger_from_options(options)
2929
expect(result_opts[:foo]).to eq('bar')
30-
expect(result_opts[:logger]).to be_nil
30+
expect(result_opts.key?(:logger)).to eq(false)
3131
expect(result_logger).to eq(logger)
3232
end
3333
end

0 commit comments

Comments
 (0)