Merge branch 'master' into feature/rack-2

rack · May 2, 2017 · 9b7a960 · 9b7a960
2 parents 4fafcca + e1b0d73
commit 9b7a960
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/rack/test/utils.rb b/lib/rack/test/utils.rb
@@ -30,13 +30,12 @@ def build_nested_query(value, prefix = nil)
       end
       module_function :build_nested_query
 
-      def build_multipart(params, first = true)
+      def build_multipart(params, first = true, multipart = false)
         if first
           unless params.is_a?(Hash)
             raise ArgumentError, "value must be a Hash"
           end
 
-          multipart = false
           query = lambda { |value|
             case value
             when Array

diff --git a/rack-test.gemspec b/rack-test.gemspec
@@ -6,6 +6,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bryan Helmkamp"]
+  s.license = 'MIT'
   s.date = "2015-01-09"
   s.description = "Rack::Test is a small, simple testing API for Rack apps. It can be used on its\nown or as a reusable starting point for Web frameworks and testing libraries\nto build on. Most of its initial functionality is an extraction of Merb 1.0's\nrequest helpers feature."
   s.email = "bryan@brynary.com"