From 03ed6c8e78b9ba0c76055af2ddb0bdd532807d6c Mon Sep 17 00:00:00 2001 From: Patrik Ragnarsson Date: Sat, 22 Oct 2022 15:06:05 +0200 Subject: [PATCH] TestBundlePruner: do not hard code directory name (#2995) These two test would fail when running tests from a directory not named "puma", e.g. running from docker/podman like this: podman run -it --rm -v $(pwd):/app -w /app ruby:3.1.2 bash --- test/helper.rb | 2 +- test/test_bundle_pruner.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/helper.rb b/test/helper.rb index ae9c2692..628519af 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -184,7 +184,7 @@ Minitest::Test.include TestSkips class Minitest::Test - REPO_NAME = ENV['GITHUB_REPOSITORY'] ? ENV['GITHUB_REPOSITORY'][/[^\/]+\z/] : 'puma' + PROJECT_ROOT = File.dirname(__dir__) def self.run(reporter, options = {}) # :nodoc: prove_it! diff --git a/test/test_bundle_pruner.rb b/test/test_bundle_pruner.rb index d7072a46..c759965d 100644 --- a/test/test_bundle_pruner.rb +++ b/test/test_bundle_pruner.rb @@ -10,7 +10,7 @@ class TestBundlePruner < Minitest::Test dirs = bundle_pruner.send(:paths_to_require_after_prune) assert_equal(2, dirs.length) - assert_match(%r{#{REPO_NAME}/lib$}, dirs[0]) # lib dir + assert_equal(File.join(PROJECT_ROOT, "lib"), dirs[0]) # lib dir assert_match(%r{puma-#{Puma::Const::PUMA_VERSION}$}, dirs[1]) # native extension dir refute_match(%r{gems/minitest-[\d.]+/lib$}, dirs[2]) end @@ -21,7 +21,7 @@ class TestBundlePruner < Minitest::Test dirs = bundle_pruner([], ['minitest']).send(:paths_to_require_after_prune) assert_equal(3, dirs.length) - assert_match(%r{#{REPO_NAME}/lib$}, dirs[0]) # lib dir + assert_equal(File.join(PROJECT_ROOT, "lib"), dirs[0]) # lib dir assert_match(%r{puma-#{Puma::Const::PUMA_VERSION}$}, dirs[1]) # native extension dir assert_match(%r{gems/minitest-[\d.]+/lib$}, dirs[2]) # minitest dir end