From 259e4ae718efda8b92a6548a446f05aa2e190085 Mon Sep 17 00:00:00 2001 From: Douglas Eichelberger Date: Tue, 24 Jan 2023 20:07:22 -0800 Subject: [PATCH] Enable RSpec/LeakyConstantDeclaration --- Library/.rubocop_rspec.yml | 2 -- Library/Homebrew/test/exceptions_spec.rb | 3 +++ .../Homebrew/test/formula_free_port_spec.rb | 13 ++++++------ Library/Homebrew/test/patching_spec.rb | 20 ++++++++++--------- 4 files changed, 20 insertions(+), 18 deletions(-) diff --git a/Library/.rubocop_rspec.yml b/Library/.rubocop_rspec.yml index 6b27ca21a2..34fb6943b9 100644 --- a/Library/.rubocop_rspec.yml +++ b/Library/.rubocop_rspec.yml @@ -11,8 +11,6 @@ RSpec/SubjectStub: # TODO: try to enable these RSpec/DescribeClass: Enabled: false -RSpec/LeakyConstantDeclaration: - Enabled: false RSpec/MessageSpies: Enabled: false RSpec/StubbedMock: diff --git a/Library/Homebrew/test/exceptions_spec.rb b/Library/Homebrew/test/exceptions_spec.rb index ad95309fcd..6c6a39ddc3 100644 --- a/Library/Homebrew/test/exceptions_spec.rb +++ b/Library/Homebrew/test/exceptions_spec.rb @@ -89,9 +89,12 @@ describe "Exception" do let(:mod) do Module.new do + # These are defined within an anonymous module to avoid polluting the global namespace. + # rubocop:disable RSpec/LeakyConstantDeclaration class Bar < Requirement; end class Baz < Formula; end + # rubocop:enable RSpec/LeakyConstantDeclaration end end diff --git a/Library/Homebrew/test/formula_free_port_spec.rb b/Library/Homebrew/test/formula_free_port_spec.rb index 84412d61d5..8aecab4f8d 100644 --- a/Library/Homebrew/test/formula_free_port_spec.rb +++ b/Library/Homebrew/test/formula_free_port_spec.rb @@ -9,16 +9,15 @@ module Homebrew include described_class describe "#free_port" do - # IANA suggests user port from 1024 to 49151 - # and dynamic port for 49152 to 65535 - # http://www.iana.org/assignments/port-numbers - MIN_PORT = 1024 - MAX_PORT = 65535 - it "returns a free TCP/IP port" do + # IANA suggests user port from 1024 to 49151 + # and dynamic port for 49152 to 65535 + # http://www.iana.org/assignments/port-numbers + min_port = 1024 + max_port = 65535 port = free_port - expect(port).to be_between(MIN_PORT, MAX_PORT) + expect(port).to be_between(min_port, max_port) expect { TCPServer.new(port).close }.not_to raise_error end end diff --git a/Library/Homebrew/test/patching_spec.rb b/Library/Homebrew/test/patching_spec.rb index 1259ac7c4a..ed5c4a4130 100644 --- a/Library/Homebrew/test/patching_spec.rb +++ b/Library/Homebrew/test/patching_spec.rb @@ -4,15 +4,17 @@ require "formula" describe "patching" do - TESTBALL_URL = "file://#{TEST_FIXTURE_DIR}/tarballs/testball-0.1.tbz" - TESTBALL_PATCHES_URL = "file://#{TEST_FIXTURE_DIR}/tarballs/testball-0.1-patches.tgz" - PATCH_URL_A = "file://#{TEST_FIXTURE_DIR}/patches/noop-a.diff" - PATCH_URL_B = "file://#{TEST_FIXTURE_DIR}/patches/noop-b.diff" - PATCH_A_CONTENTS = File.read("#{TEST_FIXTURE_DIR}/patches/noop-a.diff").freeze - PATCH_B_CONTENTS = File.read("#{TEST_FIXTURE_DIR}/patches/noop-b.diff").freeze - APPLY_A = "noop-a.diff" - APPLY_B = "noop-b.diff" - APPLY_C = "noop-c.diff" + before do + stub_const("TESTBALL_URL", "file://#{TEST_FIXTURE_DIR}/tarballs/testball-0.1.tbz") + stub_const("TESTBALL_PATCHES_URL", "file://#{TEST_FIXTURE_DIR}/tarballs/testball-0.1-patches.tgz") + stub_const("PATCH_URL_A", "file://#{TEST_FIXTURE_DIR}/patches/noop-a.diff") + stub_const("PATCH_URL_B", "file://#{TEST_FIXTURE_DIR}/patches/noop-b.diff") + stub_const("PATCH_A_CONTENTS", File.read("#{TEST_FIXTURE_DIR}/patches/noop-a.diff").freeze) + stub_const("PATCH_B_CONTENTS", File.read("#{TEST_FIXTURE_DIR}/patches/noop-b.diff").freeze) + stub_const("APPLY_A", "noop-a.diff") + stub_const("APPLY_B", "noop-b.diff") + stub_const("APPLY_C", "noop-c.diff") + end def formula(name = "formula_name", path: Formulary.core_path(name), spec: :stable, alias_path: nil, &block) Class.new(Formula) {