diff options
| author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-08-06 16:59:02 +0200 |
|---|---|---|
| committer | SHIBATA Hiroshi <hsbt@ruby-lang.org> | 2019-08-16 14:30:23 +0900 |
| commit | 0aed0bd9ed521799c5d92c6c10ca8fa4476f8b66 (patch) | |
| tree | 252645fd5c720f2641980f2773dae40d127f6684 /spec/bundler | |
| parent | 129657ab6aa3cc9496746a6eb780c0dc748e3d20 (diff) | |
[bundler/bundler] Bump rack and sinatra to latest versions
https://github.com/bundler/bundler/commit/09ecaf04fa
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/2366
Diffstat (limited to 'spec/bundler')
| -rw-r--r-- | spec/bundler/support/artifice/endpoint.rb | 3 | ||||
| -rw-r--r-- | spec/bundler/support/artifice/endpoint_500.rb | 2 | ||||
| -rw-r--r-- | spec/bundler/support/artifice/windows.rb | 2 | ||||
| -rw-r--r-- | spec/bundler/support/rubygems_ext.rb | 5 |
4 files changed, 6 insertions, 6 deletions
diff --git a/spec/bundler/support/artifice/endpoint.rb b/spec/bundler/support/artifice/endpoint.rb index fcced6ea35..d9e9e0ae0a 100644 --- a/spec/bundler/support/artifice/endpoint.rb +++ b/spec/bundler/support/artifice/endpoint.rb @@ -4,7 +4,8 @@ require File.expand_path("../../path.rb", __FILE__) require Spec::Path.root.join("lib/bundler/deprecate") include Spec::Path -$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gems.join("gems/{artifice,rack,tilt,sinatra}-*/lib")].map(&:to_s)) +$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gems.join("gems/{artifice,mustermann,rack,tilt,sinatra}-*/lib")].map(&:to_s)) + require "artifice" require "sinatra/base" diff --git a/spec/bundler/support/artifice/endpoint_500.rb b/spec/bundler/support/artifice/endpoint_500.rb index 202ccfc829..ad51d58e67 100644 --- a/spec/bundler/support/artifice/endpoint_500.rb +++ b/spec/bundler/support/artifice/endpoint_500.rb @@ -3,7 +3,7 @@ require File.expand_path("../../path.rb", __FILE__) include Spec::Path -$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gems.join("gems/{artifice,rack,tilt,sinatra}-*/lib")].map(&:to_s)) +$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gems.join("gems/{artifice,mustermann,rack,tilt,sinatra}-*/lib")].map(&:to_s)) require "artifice" require "sinatra/base" diff --git a/spec/bundler/support/artifice/windows.rb b/spec/bundler/support/artifice/windows.rb index f7fe26ae7b..0630798df0 100644 --- a/spec/bundler/support/artifice/windows.rb +++ b/spec/bundler/support/artifice/windows.rb @@ -3,7 +3,7 @@ require File.expand_path("../../path.rb", __FILE__) include Spec::Path -$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gems.join("gems/{artifice,rack,tilt,sinatra}-*/lib")].map(&:to_s)) +$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gems.join("gems/{artifice,mustermann,rack,tilt,sinatra}-*/lib")].map(&:to_s)) require "artifice" require "sinatra/base" diff --git a/spec/bundler/support/rubygems_ext.rb b/spec/bundler/support/rubygems_ext.rb index b97b5278ce..ed2f7554b2 100644 --- a/spec/bundler/support/rubygems_ext.rb +++ b/spec/bundler/support/rubygems_ext.rb @@ -16,12 +16,11 @@ module Spec }.freeze DEPS = { - # artifice doesn't support rack 2.x now. - "rack" => "< 2.0", + "rack" => "~> 2.0", "rack-test" => "~> 1.1", "artifice" => "~> 0.6.0", "compact_index" => "~> 0.11.0", - "sinatra" => "~> 1.4.7", + "sinatra" => "~> 2.0", # Rake version has to be consistent for tests to pass "rake" => "12.3.2", "builder" => "~> 3.2", |