From 09ecaf04fa5da7bbf8479e9555f3789e097ff24f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
Date: Tue, 6 Aug 2019 16:59:02 +0200
Subject: Bump rack and sinatra to latest versions

---
 spec/support/artifice/endpoint.rb     | 3 ++-
 spec/support/artifice/endpoint_500.rb | 2 +-
 spec/support/artifice/windows.rb      | 2 +-
 spec/support/rubygems_ext.rb          | 5 ++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/spec/support/artifice/endpoint.rb b/spec/support/artifice/endpoint.rb
index fcced6ea35..d9e9e0ae0a 100644
--- a/spec/support/artifice/endpoint.rb
+++ b/spec/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/support/artifice/endpoint_500.rb b/spec/support/artifice/endpoint_500.rb
index 202ccfc829..ad51d58e67 100644
--- a/spec/support/artifice/endpoint_500.rb
+++ b/spec/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/support/artifice/windows.rb b/spec/support/artifice/windows.rb
index f7fe26ae7b..0630798df0 100644
--- a/spec/support/artifice/windows.rb
+++ b/spec/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/support/rubygems_ext.rb b/spec/support/rubygems_ext.rb
index b97b5278ce..ed2f7554b2 100644
--- a/spec/support/rubygems_ext.rb
+++ b/spec/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",
-- 
cgit v1.2.1