From c3c10160f6092c02b6087ac7e650add8228c8563 Mon Sep 17 00:00:00 2001
From: Zachary Scott <mail@zzak.io>
Date: Wed, 17 Aug 2016 19:33:45 +0900
Subject: [PATCH] Test vendor'd gems using local paths instead of git

---
 rack-protection/Gemfile | 7 +------
 sinatra-contrib/Gemfile | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/rack-protection/Gemfile b/rack-protection/Gemfile
index 9c7d6977..8e70942a 100644
--- a/rack-protection/Gemfile
+++ b/rack-protection/Gemfile
@@ -8,11 +8,6 @@ rack_version = nil if rack_version.empty? or rack_version == 'stable'
 rack_version = {:github => 'rack/rack'} if rack_version == 'master'
 gem 'rack', rack_version
 
-sinatra_version = ENV['sinatra'].to_s
-sinatra_version = nil if sinatra_version.empty? or sinatra_version == 'stable'
-sinatra_version = {:github => 'sinatra/sinatra'} if sinatra_version == 'master'
-# TODO: Remove once sinatra 2.0 is released
-sinatra_version = {:github => 'sinatra/sinatra'}
-gem 'sinatra', sinatra_version
+gem 'sinatra', path: '..'
 
 gemspec
diff --git a/sinatra-contrib/Gemfile b/sinatra-contrib/Gemfile
index 11aa52d0..48ecec17 100644
--- a/sinatra-contrib/Gemfile
+++ b/sinatra-contrib/Gemfile
@@ -3,6 +3,7 @@ gemspec
 
 gem 'mustermann', github: 'sinatra/mustermann'
 gem 'sinatra', path: '..'
+gem 'rack-protection', path: '../rack-protection'
 
 group :development, :test do
   platform :jruby do
@@ -42,4 +43,3 @@ repos = { 'tilt' => 'rtomayko/tilt', 'rack' => 'rack/rack' }
   gem lib, dep if dep
 end
 
-gem "rack-protection", github: "sinatra/rack-protection"