From 4b2395bdb15337fa9dede0cc6dedb9a322d2113e Mon Sep 17 00:00:00 2001
From: Yousaf Nabi <yousaf@pactflow.io>
Date: Fri, 29 Nov 2024 22:19:57 +0000
Subject: [PATCH] fix(deps): use rack-reverse-proxy pact-foundation fork

- fixes issue #43

- update to rack-test 2.1.0
---
 Gemfile          |  3 +++
 Gemfile.lock     | 22 +++++++++++++++-------
 pact-cli.gemspec |  3 +--
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index 68a3240..db45fed 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,3 +14,6 @@ group :development do
   gem 'conventional-changelog', '~> 1.3', git: 'https://github.com/bethesque/conventional-changelog-ruby.git', ref: 'feat/pact-foundation'
   gem 'bump', '~> 0.9'
 end
+
+gem 'rack-reverse-proxy', git: 'https://github.com/pact-foundation/rack-reverse-proxy.git',
+                          branch: 'feat/rack_2_and_3_compat'
\ No newline at end of file
diff --git a/Gemfile.lock b/Gemfile.lock
index 4ef3341..e5a20f8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,6 +5,16 @@ GIT
   specs:
     conventional-changelog (1.3.0)
 
+GIT
+  remote: https://github.com/pact-foundation/rack-reverse-proxy.git
+  revision: 7ed51994123363a6969da5c6c89e04320715494b
+  branch: feat/rack_2_and_3_compat
+  specs:
+    rack-reverse-proxy (1.0.0.pre.unreleased)
+      rack (>= 3.0, < 4.0)
+      rack-proxy (~> 0.6, >= 0.6.1)
+      rackup (~> 2.0)
+
 PATH
   remote: .
   specs:
@@ -14,7 +24,7 @@ PATH
       pact-mock_service
       pact-provider-verifier
       pact_broker-client (~> 1.28)
-      rack-test (>= 0.6.3, < 2.0.0)
+      rack-test (>= 0.6.3, < 3.0.0)
 
 GEM
   remote: https://rubygems.org/
@@ -111,16 +121,13 @@ GEM
     rack (3.1.8)
     rack-proxy (0.7.7)
       rack
-    rack-reverse-proxy (0.12.0)
-      rack (>= 1.0.0)
-      rack-proxy (~> 0.6, >= 0.6.1)
-    rack-test (0.6.3)
-      rack (>= 1.0)
+    rack-test (2.1.0)
+      rack (>= 1.3)
     rackup (2.2.1)
       rack (>= 3)
     rainbow (3.1.1)
     rake (13.2.1)
-    regexp_parser (2.9.2)
+    regexp_parser (2.9.3)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -157,6 +164,7 @@ DEPENDENCIES
   conventional-changelog (~> 1.3)!
   pact-cli!
   pry
+  rack-reverse-proxy!
   rake (~> 13.0)
   rspec (~> 3.0)
 
diff --git a/pact-cli.gemspec b/pact-cli.gemspec
index 56ab5a3..60a632c 100644
--- a/pact-cli.gemspec
+++ b/pact-cli.gemspec
@@ -47,8 +47,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "json", "~>2.8" # must match native lib install in the Dockerfile
   spec.add_dependency "bigdecimal", "~>3.1" # must match native lib install in the Dockerfile
 
-  # Locking this until we have given rack-test 3.0 a good shake out in pure Ruby
-  spec.add_dependency "rack-test", ">= 0.6.3", "< 2.0.0"
+  spec.add_dependency "rack-test", ">= 0.6.3", "< 3.0.0"
 
   spec.add_development_dependency "bump", "~> 0.9"
   spec.add_development_dependency "rake", "~> 13.0"