File tree Expand file tree Collapse file tree 3 files changed +2
-36
lines changed Expand file tree Collapse file tree 3 files changed +2
-36
lines changed Original file line number Diff line number Diff line change @@ -283,11 +283,7 @@ def replace_gem(specs, specs_by_name)
283283
284284 e = Gem ::LoadError . new ( message )
285285 e . name = dep . name
286- if e . respond_to? ( :requirement= )
287- e . requirement = dep . requirement
288- elsif e . respond_to? ( :version_requirement= )
289- e . version_requirement = dep . requirement
290- end
286+ e . requirement = dep . requirement
291287 raise e
292288 end
293289
Original file line number Diff line number Diff line change @@ -301,11 +301,7 @@ def check_for_activated_spec!(spec)
301301 e = Gem ::LoadError . new "You have already activated #{ activated_spec . name } #{ activated_spec . version } , " \
302302 "but your Gemfile requires #{ spec . name } #{ spec . version } . #{ suggestion } "
303303 e . name = spec . name
304- if e . respond_to? ( :requirement= )
305- e . requirement = Gem ::Requirement . new ( spec . version . to_s )
306- else
307- e . version_requirement = Gem ::Requirement . new ( spec . version . to_s )
308- end
304+ e . requirement = Gem ::Requirement . new ( spec . version . to_s )
309305 raise e
310306 end
311307 end
Original file line number Diff line number Diff line change @@ -341,19 +341,6 @@ def clean_load_path(lp)
341341 expect ( out ) . to eq ( "WIN" )
342342 end
343343
344- it "version_requirement is now deprecated in rubygems 1.4.0+ when gem is missing" do
345- run <<-R
346- begin
347- gem "activesupport"
348- puts "FAIL"
349- rescue LoadError
350- puts "WIN"
351- end
352- R
353-
354- expect ( err ) . to be_empty
355- end
356-
357344 it "replaces #gem but raises when the version is wrong" do
358345 run <<-R
359346 begin
@@ -366,19 +353,6 @@ def clean_load_path(lp)
366353
367354 expect ( out ) . to eq ( "WIN" )
368355 end
369-
370- it "version_requirement is now deprecated in rubygems 1.4.0+ when the version is wrong" do
371- run <<-R
372- begin
373- gem "rack", "1.0.0"
374- puts "FAIL"
375- rescue LoadError
376- puts "WIN"
377- end
378- R
379-
380- expect ( err ) . to be_empty
381- end
382356 end
383357
384358 describe "by hiding system gems" do
You can’t perform that action at this time.
0 commit comments