aboutsummaryrefslogtreecommitdiffstats
path: root/test/rubygems/test_require.rb
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-01-04 07:31:57 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-01-04 07:31:57 +0000
commit2d08d23e9cdd13616d8819aa7a582d3a5838636f (patch)
tree0a7328679e178506827144d50fccede11dd6264f /test/rubygems/test_require.rb
parentf3b24b5b7f88ecfdefcd898f01ea1cfb2ee418f3 (diff)
downloadruby-2d08d23e9cdd13616d8819aa7a582d3a5838636f.tar.gz
* lib/rubygems/doctor.rb: Process directories in order in case the
filesystem doesn't. [ruby-trunk - Bug #7618] Process specifications before other directories in case of bugs. * test/rubygems/test_gem_doctor.rb: Test for above. * lib/rubygems.rb: Updated version. * test/rubygems/test_require.rb: Fixed double require of benchmark.rb. RubyGems bug #420. * test/rubygems/test_gem_commands_check_command.rb: Fixed unused variable warnings. * test/rubygems/test_gem_commands_query_command.rb: ditto * test/rubygems/test_gem_installer.rb: ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38691 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/rubygems/test_require.rb')
-rw-r--r--test/rubygems/test_require.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/test/rubygems/test_require.rb b/test/rubygems/test_require.rb
index 9484901581..7553822319 100644
--- a/test/rubygems/test_require.rb
+++ b/test/rubygems/test_require.rb
@@ -57,9 +57,8 @@ class TestGemRequire < Gem::TestCase
end
def test_activate_via_require_respects_loaded_files
+ require 'benchmark' # stdlib
save_loaded_features do
- require 'benchmark' # stdlib
-
a1 = new_spec "a", "1", {"b" => ">= 1"}, "lib/a.rb"
b1 = new_spec "b", "1", nil, "lib/benchmark.rb"
b2 = new_spec "b", "2", nil, "lib/benchmark.rb"