Skip to content

Commit 792877d

Browse files
authored
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
2 parents 5dc44f4 + cc77498 commit 792877d

File tree

4 files changed

+10
-7
lines changed

4 files changed

+10
-7
lines changed

.github/workflows/release_gem.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
test:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414
- uses: ruby/setup-ruby@v1
1515
with:
1616
ruby-version: '3.2'
@@ -28,7 +28,7 @@ jobs:
2828
version: ${{ steps.release-gem.outputs.version }}
2929
increment: ${{ steps.release-gem.outputs.increment }}
3030
steps:
31-
- uses: actions/checkout@v3
31+
- uses: actions/checkout@v4
3232
with:
3333
fetch-depth: 0
3434
- id: release-gem

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
# run:
1818
# shell: bash
1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121
- uses: ruby/setup-ruby@v1
2222
with:
2323
ruby-version: ${{ matrix.ruby_version }}
@@ -31,7 +31,7 @@ jobs:
3131
ruby_version: ["3.2"]
3232
os: ["ubuntu-latest","windows-latest","macos-latest"]
3333
steps:
34-
- uses: actions/checkout@v3
34+
- uses: actions/checkout@v4
3535
- uses: ruby/setup-ruby@v1
3636
with:
3737
ruby-version: ${{ matrix.ruby_version }}
@@ -49,7 +49,7 @@ jobs:
4949
run:
5050
shell: bash
5151
steps:
52-
- uses: actions/checkout@v3
52+
- uses: actions/checkout@v4
5353
- uses: ruby/setup-ruby@v1
5454
with:
5555
ruby-version: ${{ matrix.ruby_version }}

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,5 @@ Gemfile.lock
3232
gemfiles/*.gemfile.lock
3333
reports/pacts
3434
spec/examples.txt
35-
*bethtest*
35+
*bethtest*
36+
.DS_Store

spec/support/ssl_server.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,15 @@ def webrick_opts port
3434
require "rack"
3535
begin
3636
require "rackup/handler/webrick" # rack 3
37+
PactWEBrick = Rackup::Handler::WEBrick
3738
rescue LoadError
3839
require "rack/handler/webrick" # rack 2
40+
PactWEBrick = Rack::Handler::WEBrick
3941
end
4042

4143
opts = webrick_opts(4444)
4244

43-
Rack::Handler::WEBrick.run(app, **opts) do |server|
45+
PactWEBrick.run(app, **opts) do |server|
4446
@server = server
4547
end
4648
end

0 commit comments

Comments
 (0)