Add test matrix and update dependencies (#52)

Author: duffn

.github/workflows/rubocop.yml

@@ -4,10 +4,10 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.1.1
+          ruby-version: "2.7"
           bundler-cache: true
       - run: bundle exec rubocop

.github/workflows/test.yml

@@ -3,20 +3,28 @@ on: [push, pull_request]
 jobs:
   test:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - "2.7"
+          - "3.0"
+          - "3.1"
+          - "3.2"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.1.1
+          ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
       - uses: browser-actions/setup-geckodriver@latest
         with:
-          geckodriver-version: 0.18.0
-      - uses: browser-actions/setup-firefox@latest
+          geckodriver-version: "0.32.2"
+      - uses: browser-actions/setup-firefox@v1
         with:
-          firefox-version: '54.0'
+          firefox-version: "111.0.1"
       - uses: GabrielBB/xvfb-action@v1
         with:
           run: |
-            bundle exec rake spec
+            bundle exec rake spec

Gemfile

@@ -1,7 +1,5 @@
 source 'http://rubygems.org'
 
-ruby '3.1.1'
-
 gem 'grape'
 gem 'grape-entity'
 gem 'grape-swagger'
@@ -10,6 +8,7 @@ gem 'json'
 gem 'mime-types'
 gem 'newrelic_rpm'
 gem 'nokogiri'
+gem 'rack', '< 3'
 gem 'rack-cors'
 gem 'webrick'
 

Gemfile.lock

@@ -6,11 +6,11 @@ GEM
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     builder (3.2.4)
-    capybara (3.37.1)
+    capybara (3.38.0)
       addressable
       matrix
       mini_mime (>= 0.1.3)
@@ -19,41 +19,36 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    childprocess (4.1.0)
     coderay (1.1.3)
     concurrent-ruby (1.2.2)
     diff-lcs (1.5.0)
-    dry-configurable (0.15.0)
+    dry-core (1.0.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.6)
-    dry-container (0.9.0)
+      zeitwerk (~> 2.6)
+    dry-inflector (1.0.0)
+    dry-logic (1.5.0)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.13, >= 0.13.0)
-    dry-core (0.7.1)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-types (1.7.1)
       concurrent-ruby (~> 1.0)
-    dry-inflector (0.2.1)
-    dry-logic (1.2.0)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5)
-    dry-types (1.5.1)
-      concurrent-ruby (~> 1.0)
-      dry-container (~> 0.3)
-      dry-core (~> 0.5, >= 0.5)
-      dry-inflector (~> 0.1, >= 0.1.2)
-      dry-logic (~> 1.0, >= 1.0.2)
+      dry-core (~> 1.0)
+      dry-inflector (~> 1.0)
+      dry-logic (~> 1.4)
+      zeitwerk (~> 2.6)
     ffi (1.15.5)
     formatador (1.1.0)
-    grape (1.6.2)
+    grape (1.7.0)
       activesupport
       builder
       dry-types (>= 1.1)
       mustermann-grape (~> 1.0.0)
       rack (>= 1.3.0)
       rack-accept
-    grape-entity (0.10.1)
+    grape-entity (1.0.0)
       activesupport (>= 3.0.0)
       multi_json (>= 1.3.2)
-    grape-swagger (1.4.2)
+    grape-swagger (1.6.0)
       grape (~> 1.3)
     grape-swagger-entity (0.5.1)
       grape-entity (>= 0.6.0)
@@ -67,7 +62,7 @@ GEM
       pry (>= 0.13.0)
       shellany (~> 0.0)
       thor (>= 0.18.1)
-    guard-bundler (3.0.0)
+    guard-bundler (3.0.1)
       bundler (>= 2.1, < 3)
       guard (~> 2.2)
       guard-compat (~> 1.1)
@@ -78,87 +73,90 @@ GEM
       spoon
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    json (2.6.2)
-    listen (3.7.1)
+    json (2.6.3)
+    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.2.8)
     matrix (0.4.2)
     method_source (1.0.0)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2022.0105)
+    mime-types-data (3.2023.0218.1)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.0)
+    mini_portile2 (2.8.1)
     minitest (5.18.0)
     multi_json (1.15.0)
-    mustermann (1.1.1)
+    mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
     mustermann-grape (1.0.2)
       mustermann (>= 1.0.0)
     nenv (0.3.0)
-    newrelic_rpm (8.8.0)
-    nokogiri (1.13.10)
+    newrelic_rpm (9.0.0)
+    nokogiri (1.14.2)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
     parallel (1.22.1)
-    parser (3.1.2.0)
+    parser (3.2.1.1)
       ast (~> 2.4.1)
-    pry (0.14.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.7)
-    racc (1.6.1)
+    public_suffix (5.0.1)
+    racc (1.6.2)
     rack (2.2.6.4)
     rack-accept (0.4.5)
       rack (>= 0.4)
-    rack-cors (1.1.1)
+    rack-cors (2.0.1)
       rack (>= 2.0.0)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
+    rack-test (2.1.0)
+      rack (>= 1.3)
     rainbow (3.1.1)
     rake (13.0.6)
-    rb-fsevent (0.11.1)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    regexp_parser (2.5.0)
+    regexp_parser (2.7.0)
     rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.1)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.4)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    rubocop (1.30.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.48.1)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.18.0, < 2.0)
+      rubocop-ast (>= 1.26.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.18.0)
-      parser (>= 3.1.1.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.28.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.17.1)
+      rubocop (~> 1.41)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.11.1)
-      rubocop (~> 1.19)
-    ruby-progressbar (1.11.0)
+    rubocop-rspec (2.19.0)
+      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
+    ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
-    selenium-webdriver (4.2.1)
-      childprocess (>= 0.5, < 5.0)
+    selenium-webdriver (4.8.2)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
@@ -168,11 +166,12 @@ GEM
     thor (1.2.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.1.0)
-    webrick (1.7.0)
+    unicode-display_width (2.4.2)
+    webrick (1.8.1)
     websocket (1.2.9)
     xpath (3.2.0)
       nokogiri (~> 1.8)
+    zeitwerk (2.6.7)
 
 PLATFORMS
   ruby
@@ -190,6 +189,7 @@ DEPENDENCIES
   mime-types
   newrelic_rpm
   nokogiri
+  rack (< 3)
   rack-cors
   rack-test
   rake
@@ -200,8 +200,5 @@ DEPENDENCIES
   selenium-webdriver
   webrick
 
-RUBY VERSION
-   ruby 3.1.1p18
-
 BUNDLED WITH
    2.3.15

api/wrap_response_decorator.rb

@@ -7,7 +7,7 @@ def initialize(app)
     def call(env)
       status, headers, body_proxy = @app.call(env)
       bodies = body_proxy.map do |body|
-        { body: JSON.parse(body), status: }.to_json
+        { body: JSON.parse(body), status: status }.to_json
       end
       [200, headers, bodies]
     end

config/application.rb

@@ -6,7 +6,7 @@
 
 Bundler.require :default, ENV.fetch('RACK_ENV', nil)
 
-Dir[File.expand_path('../api/*.rb', __dir__)].each do |f|
+Dir[File.expand_path('../api/*.rb', __dir__)].sort.each do |f|
   require f
 end
 

spec/api/headers_spec.rb

@@ -11,7 +11,8 @@ def app
     get '/api/headers'
     expect(JSON.parse(last_response.body)).to eq(
       'Cookie' => '',
-      'Host' => 'example.org'
+      'Host' => 'example.org',
+      'Version' => 'HTTP/1.0'
     )
   end
 
@@ -38,7 +39,8 @@ def app
     expect(JSON.parse(last_response.body)).to eq(
       'Cookie' => '',
       'Host' => 'example.org',
-      'Reticulated-Spline' => 42
+      'Reticulated-Spline' => 42,
+      'Version' => 'HTTP/1.0'
     )
   end
 end