Skip to content

Commit 6460e01

Browse files
mamemame
committed
Rename test/rubygems/test_{case,utilities}.rb to avoid "test_" prefix
This changes "test/rubygems/test_case.rb" to "test/rubygems/helper.rb", and "test/rubygems/test_utilities.rb" to "test/rubygems/utilities.rb". The two files are a helper for tests, not test files. However, a file starting with "test_" prefix is handled as a test file directly loaded by test-unit because Rakefile specifies: ``` t.test_files = FileList['test/**/test_*.rb'] ``` Directly loading test/rubygems/test_utilities.rb caused "uninitialized constant Gem::TestCase". This issue was fixed by 59c682097197fee4052b47e4b4ab86562f3eaa9b, but the fix caused a "circular require" warning because test_utilities.rb and test_case.rb are now requiring each other. Anyway, adding "test_" prefix to a test helper file is confusing, so this changeset reverts the fix and solve the issue by renaming them.
1 parent 5df8f41 commit 6460e01

File tree

129 files changed

+129
-130
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+129
-130
lines changed

‎Manifest.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -526,6 +526,7 @@ test/rubygems/good_rake.rb
526526
test/rubygems/grandchild_cert.pem
527527
test/rubygems/grandchild_cert_32.pem
528528
test/rubygems/grandchild_key.pem
529+
test/rubygems/helper.rb
529530
test/rubygems/installer_test_case.rb
530531
test/rubygems/invalid_client.pem
531532
test/rubygems/invalid_issuer_cert.pem
@@ -557,7 +558,6 @@ test/rubygems/specifications/rubyforge-0.0.1.gemspec
557558
test/rubygems/ssl_cert.pem
558559
test/rubygems/ssl_key.pem
559560
test/rubygems/test_bundled_ca.rb
560-
test/rubygems/test_case.rb
561561
test/rubygems/test_config.rb
562562
test/rubygems/test_deprecate.rb
563563
test/rubygems/test_gem.rb
@@ -690,7 +690,7 @@ test/rubygems/test_kernel.rb
690690
test/rubygems/test_project_sanity.rb
691691
test/rubygems/test_remote_fetch_error.rb
692692
test/rubygems/test_require.rb
693-
test/rubygems/test_utilities.rb
693+
test/rubygems/utilities.rb
694694
test/rubygems/wrong_key_cert.pem
695695
test/rubygems/wrong_key_cert_32.pem
696696
test/test_changelog_generator.rb

test/rubygems/test_case.rb renamed to test/rubygems/helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1596,4 +1596,4 @@ def stub(name, val_or_callable, *block_args)
15961596
end
15971597
end
15981598

1599-
require_relative 'test_utilities'
1599+
require_relative 'utilities'

‎test/rubygems/installer_test_case.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: true
2-
require_relative 'test_case'
2+
require_relative 'helper'
33
require 'rubygems/installer'
44

55
class Gem::Installer

‎test/rubygems/package/tar_test_case.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: true
2-
require_relative '../test_case'
2+
require_relative '../helper'
33
require 'rubygems/package'
44

55
##

‎test/rubygems/test_bundled_ca.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: true
2-
require_relative 'test_case'
2+
require_relative 'helper'
33
require 'net/http'
44
require 'rubygems/openssl'
55

‎test/rubygems/test_config.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: true
2-
require_relative 'test_case'
2+
require_relative 'helper'
33
require 'rubygems'
44
require 'shellwords'
55

‎test/rubygems/test_deprecate.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: true
2-
require_relative 'test_case'
2+
require_relative 'helper'
33
require 'rubygems/deprecate'
44

55
class TestDeprecate < Gem::TestCase

‎test/rubygems/test_gem.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# coding: US-ASCII
2-
require_relative 'test_case'
2+
require_relative 'helper'
33
require 'rubygems'
44
require 'rubygems/command'
55
require 'rubygems/installer'

‎test/rubygems/test_gem_available_set.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: true
2-
require_relative 'test_case'
2+
require_relative 'helper'
33
require 'rubygems/available_set'
44
require 'rubygems/security'
55

‎test/rubygems/test_gem_bundler_version_finder.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: true
2-
require_relative 'test_case'
2+
require_relative 'helper'
33

44
class TestGemBundlerVersionFinder < Gem::TestCase
55
def setup

0 commit comments

Comments
 (0)