Merge pull request #8260 from rubygems/deivid-rodriguez/update-sinatra

Test with sinatra to 4.1.0

Author: deivid-rodriguez

bundler/spec/install/gemspecs_spec.rb

@@ -30,7 +30,7 @@
 
   it "should use gemspecs in the system cache when available" do
     gemfile <<-G
-      source "http://localtestserver.gem"
+      source "http://localgemserver.test"
       gem 'myrack'
     G
 

bundler/spec/runtime/inline_spec.rb

@@ -81,7 +81,7 @@ def script(code, options = {})
 
     script <<-RUBY, artifice: "endpoint"
       gemfile(true) do
-        source "https://notaserver.com"
+        source "https://notaserver.test"
         gem "activesupport", :require => true
       end
     RUBY
@@ -103,7 +103,7 @@ def confirm(msg, newline = nil)
       my_ui = MyBundlerUI.new
       my_ui.level = "confirm"
       gemfile(true, :ui => my_ui) do
-        source "https://notaserver.com"
+        source "https://notaserver.test"
         gem "activesupport", :require => true
       end
     RUBY
@@ -116,7 +116,7 @@ def confirm(msg, newline = nil)
       require 'bundler/inline'
 
       gemfile(true, :quiet => true) do
-        source "https://notaserver.com"
+        source "https://notaserver.test"
         gem "activesupport", :require => true
       end
     RUBY
@@ -363,7 +363,7 @@ def confirm(msg, newline = nil)
 
   it "installs inline gems when a Gemfile.lock is present" do
     gemfile <<-G
-      source "https://notaserver.com"
+      source "https://notaserver.test"
       gem "rake"
     G
 
@@ -397,7 +397,7 @@ def confirm(msg, newline = nil)
 
   it "does not leak Gemfile.lock versions to the installation output" do
     gemfile <<-G
-      source "https://notaserver.com"
+      source "https://notaserver.test"
       gem "rake"
     G
 

bundler/spec/support/artifice/compact_index_creds_diff_host.rb

@@ -24,7 +24,7 @@ def protected!
   end
 
   get "/gems/:id" do
-    redirect "http://diffhost.com/no/creds/#{params[:id]}"
+    redirect "http://diffhost.test/no/creds/#{params[:id]}"
   end
 
   get "/no/creds/:id" do

bundler/spec/support/artifice/endpoint_creds_diff_host.rb

@@ -24,7 +24,7 @@ def protected!
   end
 
   get "/gems/:id" do
-    redirect "http://diffhost.com/no/creds/#{params[:id]}"
+    redirect "http://diffhost.test/no/creds/#{params[:id]}"
   end
 
   get "/no/creds/:id" do

bundler/spec/support/artifice/helpers/endpoint.rb

@@ -27,6 +27,7 @@ def self.all_requests
 
   set :raise_errors, true
   set :show_exceptions, false
+  set :host_authorization, permitted_hosts: [".example.org", ".local", ".repo", ".repo1", ".repo2", ".repo3", ".repo4", ".rubygems.org", ".security", ".source", ".test", "127.0.0.1"]
 
   def call!(*)
     super.tap do

tool/bundler/test_gems.rb

@@ -8,7 +8,7 @@
 gem "webrick", "~> 1.8"
 gem "rack-test", "~> 2.1"
 gem "compact_index", "~> 0.15.0"
-gem "sinatra", "~> 4.0"
+gem "sinatra", "~> 4.1"
 gem "rake", "~> 13.1"
 gem "builder", "~> 3.2"
 gem "rb_sys"

tool/bundler/test_gems.rb.lock

@@ -4,11 +4,13 @@ GEM
     base64 (0.2.0)
     builder (3.3.0)
     compact_index (0.15.0)
+    logger (1.6.1)
     mustermann (3.0.3)
       ruby2_keywords (~> 0.0.1)
     rack (3.1.8)
-    rack-protection (4.0.0)
+    rack-protection (4.1.0)
       base64 (>= 0.1.0)
+      logger (>= 1.6.0)
       rack (>= 3.0.0, < 4)
     rack-session (2.0.0)
       rack (>= 3.0.0)
@@ -22,10 +24,11 @@ GEM
     ruby2_keywords (0.0.5)
     rubygems-generate_index (1.1.3)
       compact_index (~> 0.15.0)
-    sinatra (4.0.0)
+    sinatra (4.1.0)
+      logger (>= 1.6.0)
       mustermann (~> 3.0)
       rack (>= 3.0.0, < 4)
-      rack-protection (= 4.0.0)
+      rack-protection (= 4.1.0)
       rack-session (>= 2.0.0, < 3)
       tilt (~> 2.0)
     tilt (2.4.0)
@@ -49,24 +52,25 @@ DEPENDENCIES
   rake (~> 13.1)
   rb_sys
   rubygems-generate_index (~> 1.1)
-  sinatra (~> 4.0)
+  sinatra (~> 4.1)
   webrick (~> 1.8)
 
 CHECKSUMS
   base64 (0.2.0) sha256=0f25e9b21a02a0cc0cea8ef92b2041035d39350946e8789c562b2d1a3da01507
   builder (3.3.0) sha256=497918d2f9dca528fdca4b88d84e4ef4387256d984b8154e9d5d3fe5a9c8835f
   compact_index (0.15.0) sha256=5c6c404afca8928a7d9f4dde9524f6e1610db17e675330803055db282da84a8b
+  logger (1.6.1) sha256=3ad9587ed3940bf7897ea64a673971415523f4f7d6b22c5e3af5219705669653
   mustermann (3.0.3) sha256=d1f8e9ba2ddaed47150ddf81f6a7ea046826b64c672fbc92d83bce6b70657e88
   rack (3.1.8) sha256=d3fbcbca43dc2b43c9c6d7dfbac01667ae58643c42cea10013d0da970218a1b1
-  rack-protection (4.0.0) sha256=d0db6185caa46a8c0d134c2c6b4803f4f392a67b2984da311409cb505f67bbf6
+  rack-protection (4.1.0) sha256=c32350d08b28f53df08c9e7c770900fa863593826e9f4f3cdd02ec685902ac30
   rack-session (2.0.0) sha256=db04b2063e180369192a9046b4559af311990af38c6a93d4c600cee4eb6d4e81
   rack-test (2.1.0) sha256=0c61fc61904049d691922ea4bb99e28004ed3f43aa5cfd495024cc345f125dfb
   rackup (2.1.0) sha256=6ecb884a581990332e45ee17bdfdc14ccbee46c2f710ae1566019907869a6c4d
   rake (13.2.1) sha256=46cb38dae65d7d74b6020a4ac9d48afed8eb8149c040eccf0523bec91907059d
   rb_sys (0.9.102) sha256=6ed736cc0d0bc236327e233f349ba16913231051df1c886c471ed268ce0e623b
   ruby2_keywords (0.0.5) sha256=ffd13740c573b7301cf7a2e61fc857b2a8e3d3aff32545d6f8300d8bae10e3ef
   rubygems-generate_index (1.1.3) sha256=3571424322666598e9586a906485e1543b617f87644913eaf137d986a3393f5c
-  sinatra (4.0.0) sha256=54f6687b1daf2cfda6cef3f5dc90f47a8d05563cae7753e77cb01f4d3615497d
+  sinatra (4.1.0) sha256=27d3217f6d83d49c8a9326ae8b688c253ecce2d39582cff24660b0e34b3e9df7
   tilt (2.4.0) sha256=df74f29a451daed26591a85e8e0cebb198892cb75b6573394303acda273fba4d
   webrick (1.8.2) sha256=431746a349199546ff9dd272cae10849c865f938216e41c402a6489248f12f21