Merge pull request #310 from pact-foundation/fix/test_rack_2_or_3

fix(test): alias Rack/Rackup WEBrick handler in x509 test for backwards compat

Author: YOU54F

.github/workflows/release_gem.yml

@@ -10,7 +10,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: '3.2'
@@ -28,7 +28,7 @@ jobs:
       version: ${{ steps.release-gem.outputs.version }}
       increment: ${{ steps.release-gem.outputs.increment }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
     - id: release-gem

.github/workflows/test.yml

@@ -17,7 +17,7 @@ jobs:
     #   run:
     #     shell: bash
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby_version }}
@@ -31,7 +31,7 @@ jobs:
         ruby_version: ["3.2"]
         os: ["ubuntu-latest","windows-latest","macos-latest"]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby_version }}
@@ -49,7 +49,7 @@ jobs:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby_version }}

.gitignore

@@ -32,4 +32,5 @@ Gemfile.lock
 gemfiles/*.gemfile.lock
 reports/pacts
 spec/examples.txt
-*bethtest*
+*bethtest*
+.DS_Store

spec/support/ssl_server.rb

@@ -34,13 +34,15 @@ def webrick_opts port
   require "rack"
   begin
     require "rackup/handler/webrick" # rack 3
+    PactWEBrick = Rackup::Handler::WEBrick
   rescue LoadError
     require "rack/handler/webrick"  # rack 2
+    PactWEBrick = Rack::Handler::WEBrick
   end
 
   opts = webrick_opts(4444)
 
-  Rack::Handler::WEBrick.run(app, **opts) do |server|
+  PactWEBrick.run(app, **opts) do |server|
     @server = server
   end
 end