Clean up README merge conflict

2026-01-25 07:16:40 +00:00 · 2021-02-09 08:05:58 -07:00
parent 7ef900ec1d 9916d3f0b0
commit 52939874d6
2 changed files with 8 additions and 9 deletions
--- a/rswag-specs/lib/rswag/specs/configuration.rb
+++ b/rswag-specs/lib/rswag/specs/configuration.rb
@@ -28,9 +28,11 @@ module Rswag
      end

      def swagger_dry_run
-        @swagger_dry_run ||= begin
-          @rspec_config.swagger_dry_run.nil? || @rspec_config.swagger_dry_run
+        return @swagger_dry_run if defined? @swagger_dry_run
+        if ENV.key?('SWAGGER_DRY_RUN')
+          @rspec_config.swagger_dry_run = ENV['SWAGGER_DRY_RUN'] == '1'
        end
+        @swagger_dry_run = @rspec_config.swagger_dry_run.nil? || @rspec_config.swagger_dry_run
      end

      def swagger_format