diff --git a/spec/bundler/install/gems/dependency_api_fallback_spec.rb b/spec/bundler/install/gems/dependency_api_fallback_spec.rb index f2443233e26f03..42239311e2e05c 100644 --- a/spec/bundler/install/gems/dependency_api_fallback_spec.rb +++ b/spec/bundler/install/gems/dependency_api_fallback_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_relative "../../support/silent_logger" - RSpec.describe "gemcutter's dependency API" do context "when Gemcutter API takes too long to respond" do before do @@ -11,6 +9,7 @@ @server_uri = "http://127.0.0.1:#{port}" require_relative "../../support/artifice/endpoint_timeout" + require_relative "../../support/silent_logger" require "rackup/server" diff --git a/spec/bundler/realworld/gemfile_source_header_spec.rb b/spec/bundler/realworld/gemfile_source_header_spec.rb index f47ba3a855a430..c532c6a867186f 100644 --- a/spec/bundler/realworld/gemfile_source_header_spec.rb +++ b/spec/bundler/realworld/gemfile_source_header_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_relative "../support/silent_logger" - RSpec.describe "fetching dependencies with a mirrored source", realworld: true do let(:mirror) { "https://server.example.org" } let(:original) { "http://127.0.0.1:#{@port}" } @@ -38,6 +36,7 @@ def setup_server @server_uri = "http://127.0.0.1:#{@port}" require_relative "../support/artifice/endpoint_mirror_source" + require_relative "../support/silent_logger" require "rackup/server" diff --git a/spec/bundler/realworld/mirror_probe_spec.rb b/spec/bundler/realworld/mirror_probe_spec.rb index 61312860d18b27..66a553da280ae0 100644 --- a/spec/bundler/realworld/mirror_probe_spec.rb +++ b/spec/bundler/realworld/mirror_probe_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_relative "../support/silent_logger" - RSpec.describe "fetching dependencies with a not available mirror", realworld: true do let(:mirror) { @mirror_uri } let(:original) { @server_uri } @@ -111,6 +109,7 @@ def setup_server @server_uri = "http://#{host}:#{@server_port}" require_relative "../support/artifice/endpoint" + require_relative "../support/silent_logger" require "rackup/server" diff --git a/spec/bundler/support/silent_logger.rb b/spec/bundler/support/silent_logger.rb index 8665beb2c9f380..4b270330fd9c3c 100644 --- a/spec/bundler/support/silent_logger.rb +++ b/spec/bundler/support/silent_logger.rb @@ -1,10 +1,10 @@ # frozen_string_literal: true -require "logger" +require "webrick" module Spec - class SilentLogger - (::Logger.instance_methods - Object.instance_methods).each do |logger_instance_method| - define_method(logger_instance_method) {|*args, &blk| } + class SilentLogger < WEBrick::BasicLog + def initialize(log_file = nil, level = nil) + super(log_file, level || FATAL) end end end diff --git a/tool/bundler/dev_gems.rb b/tool/bundler/dev_gems.rb index fdde5725ffc916..c9aae0afe50543 100644 --- a/tool/bundler/dev_gems.rb +++ b/tool/bundler/dev_gems.rb @@ -13,7 +13,6 @@ gem "rspec-expectations", "~> 3.12" gem "rspec-mocks", "~> 3.12" gem "uri", "~> 0.13.0" -gem "logger", "~> 1.6.5" group :doc do gem "ronn-ng", "~> 0.10.1", platform: :ruby