@@ -78,8 +78,6 @@ def test_dash_i_beats_gems
7878 FileUtils . mkdir_p File . dirname c_rb
7979 File . open ( c_rb , 'w' ) { |f | f . write "class Object; HELLO = 'world' end" }
8080
81- lp = $LOAD_PATH. dup
82-
8381 # Pretend to provide a commandline argument that overrides a file in gem b
8482 $LOAD_PATH. unshift dash_i_arg
8583
@@ -88,7 +86,6 @@ def test_dash_i_beats_gems
8886 assert_equal "world" , ::Object ::HELLO
8987 assert_equal %w[ a-1 b-1 ] , loaded_spec_names
9088 ensure
91- $LOAD_PATH. replace lp
9289 Object . send :remove_const , :HELLO if Object . const_defined? :HELLO
9390 end
9491
@@ -122,8 +119,6 @@ def test_dash_i_beats_default_gems
122119
123120 assert_require 'test_gem_require_a'
124121
125- lp = $LOAD_PATH. dup
126-
127122 # Pretend to provide a commandline argument that overrides a file in gem b
128123 $LOAD_PATH. unshift dash_i_arg
129124
@@ -132,7 +127,6 @@ def test_dash_i_beats_default_gems
132127 assert_equal "world" , ::Object ::HELLO
133128 assert_equal %w[ a-1 b-1 ] , loaded_spec_names
134129 ensure
135- $LOAD_PATH. replace lp
136130 Object . send :remove_const , :HELLO if Object . const_defined? :HELLO
137131 end
138132
@@ -143,16 +137,10 @@ def test_dash_i_respects_default_library_extension_priority
143137 dash_i_ext_arg = util_install_extension_file ( 'a' )
144138 dash_i_lib_arg = util_install_ruby_file ( 'a' )
145139
146- lp = $LOAD_PATH. dup
147-
148- begin
149- $LOAD_PATH. unshift dash_i_lib_arg
150- $LOAD_PATH. unshift dash_i_ext_arg
151- assert_require 'a'
152- assert_match ( /a\. rb$/ , $LOADED_FEATURES. last )
153- ensure
154- $LOAD_PATH. replace lp
155- end
140+ $LOAD_PATH. unshift dash_i_lib_arg
141+ $LOAD_PATH. unshift dash_i_ext_arg
142+ assert_require 'a'
143+ assert_match ( /a\. rb$/ , $LOADED_FEATURES. last )
156144 end
157145
158146 def test_concurrent_require
0 commit comments