Merge pull request #541 from alphagov/dependabot/bundler/rack-3.1.7

Bump rack from 2.2.9 to 3.1.7
alphagov · Jul 30, 2024 · 93023b7 · 93023b7
2 parents 1c5dc14 + b0ca019
commit 93023b7
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/Gemfile b/Gemfile
@@ -7,7 +7,7 @@ gem "govuk_app_config", "~> 9.14.0"
 gem "nokogiri", "1.16.7"
 gem "optic14n", "2.1.0" # Ideally version should be synced with Transition
 gem "pg"
-gem "rack", "~> 2.2.9"
+gem "rack", "~> 3.1.7"
 gem "rake", "13.2.1"
 
 group :development do

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -331,16 +331,16 @@ GEM
     puma (6.4.2)
       nio4r (~> 2.0)
     racc (1.8.0)
-    rack (2.2.9)
+    rack (3.1.7)
     rack-proxy (0.7.7)
       rack
-    rack-session (1.0.2)
-      rack (< 3)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rackup (1.0.0)
-      rack (< 3)
-      webrick
+    rackup (2.1.0)
+      rack (>= 3)
+      webrick (~> 1.8)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -459,7 +459,7 @@ DEPENDENCIES
   optic14n (= 2.1.0)
   pg
   pry
-  rack (~> 2.2.9)
+  rack (~> 3.1.7)
   rack-test (= 2.1.0)
   rake (= 13.2.1)
   rspec

diff --git a/lib/benchmark/all.rb b/lib/benchmark/all.rb
@@ -21,7 +21,7 @@ def initialize(number_of_runs)
     end
 
     def app
-      @app ||= Rack::Builder.parse_file("config.ru")[0]
+      @app ||= Rack::Builder.parse_file("config.ru")
     end
 
     def run!

diff --git a/spec/features/http_request_handling_spec.rb b/spec/features/http_request_handling_spec.rb
@@ -6,7 +6,7 @@
   subject { last_response }
 
   def app
-    Rack::Builder.parse_file("config.ru")[0]
+    Rack::Builder.parse_file("config.ru")
   end
 
   let(:department_of_health) do
@@ -896,7 +896,7 @@ def app
     # In dev (but not production), CommonLogger middleware is in use, which expects
     # us not to violate the Rack spec. Part of this is not allowing nil query strings,
     # which at time of writing optic14n does.
-    let(:app) { Rack::CommonLogger.new(Rack::Builder.parse_file("config.ru")[0]) }
+    let(:app) { Rack::CommonLogger.new(Rack::Builder.parse_file("config.ru")) }
 
     describe "Nil querystrings do not faze us" do
       before do

diff --git a/spec/performance/benchmark_spec.rb b/spec/performance/benchmark_spec.rb
@@ -5,7 +5,7 @@
   include Rack::Test::Methods
 
   def app
-    Rack::Builder.parse_file("config.ru")[0]
+    Rack::Builder.parse_file("config.ru")
   end
 
   let(:number_of_runs) { ENV["NUMBER_OF_RUNS"] || 1000 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,7 @@ def initialize(number_of_runs) @@
         end
         def app
-          @app ||= Rack::Builder.parse_file("config.ru")[0]
+          @app ||= Rack::Builder.parse_file("config.ru")
         end
         def run!
@@ Expand Down @@