diff options
author | Samuel Giddins <segiddins@segiddins.me> | 2016-11-19 12:01:07 -0600 |
---|---|---|
committer | Samuel Giddins <segiddins@segiddins.me> | 2016-11-27 15:00:00 -0600 |
commit | c5efd85580d6a6d40442393f1f2d21c6db1306e1 (patch) | |
tree | 240708a723e148d4a67a023c1475bf2fa32d85f6 /spec/support/artifice | |
parent | 345ed1cbd8b092eb8de18b993d05aa3217ad6e21 (diff) | |
download | bundler-c5efd85580d6a6d40442393f1f2d21c6db1306e1.tar.gz |
Update to sinatra 1.4.7 in the specsseg-specs-sinatra-update
Diffstat (limited to 'spec/support/artifice')
-rw-r--r-- | spec/support/artifice/endpoint.rb | 7 | ||||
-rw-r--r-- | spec/support/artifice/endpoint_500.rb | 6 | ||||
-rw-r--r-- | spec/support/artifice/fail.rb | 5 |
3 files changed, 3 insertions, 15 deletions
diff --git a/spec/support/artifice/endpoint.rb b/spec/support/artifice/endpoint.rb index fae72ea4cd..861ac49e93 100644 --- a/spec/support/artifice/endpoint.rb +++ b/spec/support/artifice/endpoint.rb @@ -3,12 +3,7 @@ require File.expand_path("../../path.rb", __FILE__) require File.expand_path("../../../../lib/bundler/deprecate", __FILE__) include Spec::Path -# Set up pretend http gem server with Artifice -$LOAD_PATH.unshift "#{Dir[base_system_gems.join("gems/artifice*/lib")].first}" -$LOAD_PATH.unshift "#{Dir[base_system_gems.join("gems/rack-*/lib")].first}" -$LOAD_PATH.unshift "#{Dir[base_system_gems.join("gems/rack-*/lib")].last}" -$LOAD_PATH.unshift "#{Dir[base_system_gems.join("gems/tilt*/lib")].first}" -$LOAD_PATH.unshift "#{Dir[base_system_gems.join("gems/sinatra*/lib")].first}" +$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gems.join("gems/{artifice,rack,tilt,sinatra}-*/lib")].map(&:to_s)) require "artifice" require "sinatra/base" diff --git a/spec/support/artifice/endpoint_500.rb b/spec/support/artifice/endpoint_500.rb index 9bbbd1e2f2..993630b79e 100644 --- a/spec/support/artifice/endpoint_500.rb +++ b/spec/support/artifice/endpoint_500.rb @@ -2,11 +2,7 @@ require File.expand_path("../../path.rb", __FILE__) include Spec::Path -$LOAD_PATH.unshift "#{Dir[base_system_gems.join("gems/artifice*/lib")].first}" -$LOAD_PATH.unshift "#{Dir[base_system_gems.join("gems/rack-*/lib")].first}" -$LOAD_PATH.unshift "#{Dir[base_system_gems.join("gems/rack-*/lib")].last}" -$LOAD_PATH.unshift "#{Dir[base_system_gems.join("gems/tilt*/lib")].first}" -$LOAD_PATH.unshift "#{Dir[base_system_gems.join("gems/sinatra*/lib")].first}" +$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gems.join("gems/{artifice,rack,tilt,sinatra}-*/lib")].map(&:to_s)) require "artifice" require "sinatra/base" diff --git a/spec/support/artifice/fail.rb b/spec/support/artifice/fail.rb index 2e29c03c5b..2ef009c7c8 100644 --- a/spec/support/artifice/fail.rb +++ b/spec/support/artifice/fail.rb @@ -3,10 +3,7 @@ require File.expand_path("../../path.rb", __FILE__) # Set up pretend http gem server with Artifice -$LOAD_PATH.unshift Dir[Spec::Path.base_system_gems.join("gems/artifice*/lib")].first.to_s -$LOAD_PATH.unshift Dir[Spec::Path.base_system_gems.join("gems/rack-*/lib")].first.to_s -$LOAD_PATH.unshift Dir[Spec::Path.base_system_gems.join("gems/rack-*/lib")].last.to_s -$LOAD_PATH.unshift Dir[Spec::Path.base_system_gems.join("gems/tilt*/lib")].first.to_s +$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gems.join("gems/{artifice,rack,tilt}-*/lib")].map(&:to_s)) require "artifice" class Fail |