From 8297fd37c639f1dd431011d985ef60890856f8c2 Mon Sep 17 00:00:00 2001 From: exoego Date: Tue, 27 Jun 2023 14:55:44 +0900 Subject: [PATCH] fix minor issues --- .simplecov_spawn.rb | 6 ++++-- Gemfile | 2 +- lib/rspec/openapi/record_builder.rb | 3 ++- lib/rspec/openapi/schema_builder.rb | 7 ++++--- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.simplecov_spawn.rb b/.simplecov_spawn.rb index 511ce732..4243ef7e 100644 --- a/.simplecov_spawn.rb +++ b/.simplecov_spawn.rb @@ -1,4 +1,6 @@ -unless ENV["COVERAGE"] && ENV["COVERAGE"].empty? +# frozen_string_literal: true + +unless ENV['COVERAGE'] && ENV['COVERAGE'].empty? require 'simplecov' require 'simplecov-cobertura' @@ -6,4 +8,4 @@ SimpleCov.at_fork.call(Process.pid) SimpleCov.formatter SimpleCov::Formatter::CoberturaFormatter SimpleCov.start -end \ No newline at end of file +end diff --git a/Gemfile b/Gemfile index cc9124e7..897b4735 100644 --- a/Gemfile +++ b/Gemfile @@ -10,9 +10,9 @@ gem 'roda' gem 'rspec-rails' group :test do - gem 'super_diff' gem 'simplecov' gem 'simplecov-cobertura' + gem 'super_diff' end group :development do diff --git a/lib/rspec/openapi/record_builder.rb b/lib/rspec/openapi/record_builder.rb index 5f816508..54f5fd93 100644 --- a/lib/rspec/openapi/record_builder.rb +++ b/lib/rspec/openapi/record_builder.rb @@ -11,7 +11,8 @@ def build(context, example:) request, response = extract_request_response(context) return if request.nil? - path, summary, tags, required_request_params, raw_path_params, description, security = extract_request_attributes(request, example) + path, summary, tags, required_request_params, raw_path_params, description, security = + extract_request_attributes(request, example) request_headers, response_headers = extract_headers(request, response) diff --git a/lib/rspec/openapi/schema_builder.rb b/lib/rspec/openapi/schema_builder.rb index 83770af7..92999075 100644 --- a/lib/rspec/openapi/schema_builder.rb +++ b/lib/rspec/openapi/schema_builder.rb @@ -192,11 +192,12 @@ def build_example(value) def adjust_params(value) value.each do |key, v| - if v.is_a?(ActionDispatch::Http::UploadedFile) + case v + when ActionDispatch::Http::UploadedFile value[key] = v.original_filename - elsif v.is_a?(Hash) + when Hash adjust_params(v) - elsif v.is_a?(Array) + when Array result = v.map do |item| item.is_a?(ActionDispatch::Http::UploadedFile) ? item.original_filename : item end