Adapt test to new middlewares argument

Author: ahx

spec/middlewares/request_validation_spec.rb

@@ -11,7 +11,7 @@
   let(:app) do
     Rack::Builder.app do
       use Rack::Lint
-      use(OpenapiFirst::Middlewares::RequestValidation, spec: File.expand_path('../data/petstore.yaml', __dir__))
+      use(OpenapiFirst::Middlewares::RequestValidation, File.expand_path('../data/petstore.yaml', __dir__))
       use Rack::Lint
       run lambda { |_env|
         Rack::Response.new('hello', 200).finish
@@ -32,10 +32,10 @@
     end
   end
 
-  context 'when OAD is passed as first argument' do
+  context 'when OAD is passed as spec: argument' do
     let(:app) do
       Rack::Builder.app do
-        use(OpenapiFirst::Middlewares::RequestValidation, File.expand_path('../data/petstore-expanded.yaml', __dir__))
+        use(OpenapiFirst::Middlewares::RequestValidation, spec: File.expand_path('../data/petstore-expanded.yaml', __dir__))
         run ->(_) {}
       end
     end
@@ -60,7 +60,7 @@
     let(:app) do
       Rack::Builder.app do
         use(OpenapiFirst::Middlewares::RequestValidation,
-            spec: File.expand_path('../data/petstore-expanded.yaml', __dir__))
+            File.expand_path('../data/petstore-expanded.yaml', __dir__))
         run ->(_) {}
       end
     end
@@ -92,8 +92,8 @@
   context 'with error_response: :default' do
     let(:app) do
       Rack::Builder.app do
-        use OpenapiFirst::Middlewares::RequestValidation, spec: './spec/data/request-body-validation.yaml',
-                                                          error_response: :default
+        use OpenapiFirst::Middlewares::RequestValidation, './spec/data/request-body-validation.yaml',
+            error_response: :default
         run ->(_) {}
       end
     end
@@ -115,8 +115,8 @@ def content_type = 'text/plain'
         def status = 409
       end
       Rack::Builder.app do
-        use OpenapiFirst::Middlewares::RequestValidation, spec: './spec/data/request-body-validation.yaml',
-                                                          error_response: custom_class
+        use OpenapiFirst::Middlewares::RequestValidation, './spec/data/request-body-validation.yaml',
+            error_response: custom_class
         run ->(_) {}
       end
     end
@@ -133,7 +133,7 @@ def status = 409
     let(:app) do
       Rack::Builder.app do
         use(OpenapiFirst::Middlewares::RequestValidation,
-            spec: File.expand_path('../data/discriminator-refs.yaml', __dir__))
+            File.expand_path('../data/discriminator-refs.yaml', __dir__))
         run lambda { |_env|
           Rack::Response.new('hello', 200).finish
         }
@@ -178,8 +178,8 @@ def status = 409
         end
       end
       Rack::Builder.app do
-        use OpenapiFirst::Middlewares::RequestValidation, spec:,
-                                                          error_response: false
+        use OpenapiFirst::Middlewares::RequestValidation, spec,
+            error_response: false
         run lambda { |_env|
           Rack::Response.new('hello', 200).finish
         }
@@ -197,8 +197,8 @@ def status = 409
   context 'with error_response: nil' do
     let(:app) do
       Rack::Builder.app do
-        use OpenapiFirst::Middlewares::RequestValidation, spec: './spec/data/request-body-validation.yaml',
-                                                          error_response: nil
+        use OpenapiFirst::Middlewares::RequestValidation, './spec/data/request-body-validation.yaml',
+            error_response: nil
         run ->(_) {}
       end
     end
@@ -214,7 +214,7 @@ def status = 409
   describe '#app' do
     it 'returns the next app in the stack' do
       app = double
-      expect(described_class.new(app, spec: File.expand_path('../data/petstore.yaml', __dir__)).app).to eq app
+      expect(described_class.new(app, File.expand_path('../data/petstore.yaml', __dir__)).app).to eq app
     end
   end
 end

spec/middlewares/response_validation_spec.rb

@@ -25,15 +25,15 @@
   end
   let(:response) { Rack::Response.new(response_body, status, headers) }
 
-  context 'with path to OAD as first argument' do
+  context 'with path to OAD as spec: argument' do
     let(:response_body) { '2' }
 
     let(:app) do
       res = response
       definition = spec
       Rack::Builder.app do
         use Rack::Lint
-        use OpenapiFirst::Middlewares::ResponseValidation, definition
+        use OpenapiFirst::Middlewares::ResponseValidation, spec: definition
         run ->(_env) { res.finish }
       end
     end
@@ -93,7 +93,7 @@
         res = response
         definition = spec
         Rack::Builder.app do
-          use OpenapiFirst::Middlewares::ResponseValidation, spec: definition
+          use OpenapiFirst::Middlewares::ResponseValidation, definition
           run ->(_env) { res.finish }
         end
       end
@@ -255,7 +255,7 @@
   context 'when response is invalid' do
     let(:app) do
       Rack::Builder.new.tap do |builder|
-        builder.use(described_class, spec: './spec/data/petstore.yaml')
+        builder.use(described_class, './spec/data/petstore.yaml')
         builder.run lambda { |_env|
           Rack::Response.new('{"foo": "bar"}', 200, { 'Content-Type' => 'application/json' }).finish
         }
@@ -271,7 +271,7 @@
     context 'with raise_error: false' do
       let(:app) do
         Rack::Builder.new.tap do |builder|
-          builder.use(described_class, spec: './spec/data/petstore.yaml', raise_error: false)
+          builder.use(described_class, './spec/data/petstore.yaml', raise_error: false)
           builder.run lambda { |_env|
             Rack::Response.new('{"foo": "bar"}', 200, { 'Content-Type' => 'application/json' }).finish
           }
@@ -289,7 +289,7 @@
   context 'when response is not valid JSON' do
     let(:app) do
       Rack::Builder.new.tap do |builder|
-        builder.use(described_class, spec: './spec/data/petstore.yaml')
+        builder.use(described_class, './spec/data/petstore.yaml')
         builder.run lambda { |_env|
           Rack::Response.new('{boofar}', 200, { 'Content-Type' => 'application/json' }).finish
         }