lib/rack/app/test.rb in rack-app-5.0.0 vs lib/rack/app/test.rb in rack-app-5.1.0

- old
+ new

@@ -1,7 +1,8 @@ -require 'uri' -require 'rack/app' +require "uri" +require "rack/app" +require "rack/mock" module Rack::App::Test require 'rack/app/test/utils' require 'rack/app/test/singleton_methods' @@ -9,11 +10,12 @@ klass.__send__(:extend, self::SingletonMethods) end attr_reader :last_response - [:get, :post, :put, :delete, :options, :patch, :head].each do |request_method| + Rack::App::Constants::HTTP::METHODS.each do |request_method_type| + request_method = request_method_type.to_s.downcase define_method(request_method) do |*args| properties = args.select { |e| e.is_a?(Hash) }.reduce({}, &:merge!) url = args.select { |e| e.is_a?(String) }.first || properties.delete(:url) mock_request = Rack::MockRequest.new(rack_app) @@ -23,19 +25,19 @@ end end def rack_app(&block) - @app ||= lambda do + @rack_app ||= lambda do app_class = defined?(__rack_app_class__) ? __rack_app_class__ : nil constructors = [] if defined?(__rack_app_constructor__) and __rack_app_constructor__.is_a?(Proc) constructors << __rack_app_constructor__ end Rack::App::Test::Utils.rack_app_by(app_class, constructors) end.call - block.is_a?(Proc) ? @app.instance_exec(&block) : @app + block.is_a?(Proc) ? @rack_app.instance_exec(&block) : @rack_app end end