rack-test 0.6.0 → 0.6.1

data/Gemfile

@@ -3,3 +3,4 @@ source :rubygems
 gem 'rspec'
 gem "rack"
 gem "sinatra"
+gem 'rake'

data/Gemfile.lock

@@ -2,19 +2,20 @@ GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.2)
-    rack (1.2.2)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
+    rack (1.3.2)
+    rake (0.9.2)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
-    sinatra (1.2.3)
+    rspec-mocks (2.6.0)
+    sinatra (1.2.6)
       rack (~> 1.1)
       tilt (< 2.0, >= 1.2.2)
-    tilt (1.2.2)
+    tilt (1.3.2)
 
 PLATFORMS
   java
@@ -22,5 +23,6 @@ PLATFORMS
 
 DEPENDENCIES
   rack
+  rake
   rspec
   sinatra

data/History.txt

@@ -1,3 +1,11 @@
+== 0.6.1 / 2011-07-27
+
+* Bug fixes
+
+  * Fix support for params with arrays in multipart forms (Joel Chippindale)
+  * Add respond_to? to Rack::Test::UploadedFile to match method_missing (Josh Nichols)
+  * Set the Referer header on requests issued by follow_redirect! (Ryan Bigg)
+
 == 0.6.0 / 2011-05-03
 
 * Bug fixes

data/lib/rack/test.rb

@@ -9,7 +9,7 @@ require "rack/test/uploaded_file"
 
 module Rack
   module Test
-    VERSION = "0.6.0"
+    VERSION = "0.6.1"
 
     DEFAULT_HOST = "example.org"
     MULTIPART_BOUNDARY = "----------XnJLe9ZIbbGUYtzPQJ16u1"
@@ -153,14 +153,15 @@ module Rack
       end
 
       # Rack::Test will not follow any redirects automatically. This method
-      # will follow the redirect returned in the last response. If the last
-      # response was not a redirect, an error will be raised.
+      # will follow the redirect returned (including setting the Referer header
+      # on the new request) in the last response. If the last response was not
+      # a redirect, an error will be raised.
       def follow_redirect!
         unless last_response.redirect?
           raise Error.new("Last response was not a redirect. Cannot follow_redirect!")
         end
 
-        get(last_response["Location"])
+        get(last_response["Location"], {}, { "HTTP_REFERER" => last_request.url })
       end
 
     private

data/lib/rack/test/uploaded_file.rb

@@ -40,6 +40,10 @@ module Rack
         @tempfile.__send__(method_name, *args, &block)
       end
 
+      def respond_to?(method_name, include_private = false) #:nodoc:
+        @tempfile.respond_to?(method_name, include_private) || super
+      end
+
     end
 
   end

data/lib/rack/test/utils.rb

@@ -103,12 +103,17 @@ module Rack
       end
 
       def build_primitive_part(parameter_name, value)
+        unless value.is_a? Array
+          value = [value]
+        end
+        value.map do |v|
 <<-EOF
 --#{MULTIPART_BOUNDARY}\r
 Content-Disposition: form-data; name="#{parameter_name}"\r
 \r
-#{value}\r
+#{v}\r
 EOF
+        end.join
       end
 
       def build_file_part(parameter_name, uploaded_file)

data/rack-test.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rack-test}
-  s.version = "0.6.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bryan Helmkamp"]
-  s.date = %q{2011-05-03}
+  s.date = %q{2011-07-27}
   s.description = %q{Rack::Test is a small, simple testing API for Rack apps. It can be used on its
 own or as a reusable starting point for Web frameworks and testing libraries
 to build on. Most of its initial functionality is an extraction of Merb 1.0's
@@ -41,6 +41,7 @@ request helpers feature.}
     "spec/rack/test/cookie_spec.rb",
     "spec/rack/test/digest_auth_spec.rb",
     "spec/rack/test/multipart_spec.rb",
+    "spec/rack/test/uploaded_file_spec.rb",
     "spec/rack/test/utils_spec.rb",
     "spec/rack/test_spec.rb",
     "spec/spec_helper.rb",
@@ -57,6 +58,7 @@ request helpers feature.}
     "spec/rack/test/cookie_spec.rb",
     "spec/rack/test/digest_auth_spec.rb",
     "spec/rack/test/multipart_spec.rb",
+    "spec/rack/test/uploaded_file_spec.rb",
     "spec/rack/test/utils_spec.rb",
     "spec/rack/test_spec.rb",
     "spec/spec_helper.rb",

data/spec/rack/test/multipart_spec.rb

@@ -42,10 +42,8 @@ describe Rack::Test::Session do
     end
 
     it "sends params with arrays" do
-      pending "FIXME: should work the same with and without multipart" do
-        post "/", "photo" => uploaded_file, "foo" => ["1", "2"]
-        last_request.POST["foo"].should == ["1", "2"]
-      end
+      post "/", "photo" => uploaded_file, "foo" => ["1", "2"]
+      last_request.POST["foo"].should == ["1", "2"]
     end
 
     it "sends params with encoding sensitive values" do

data/spec/rack/test/uploaded_file_spec.rb

@@ -0,0 +1,22 @@
+require "spec_helper"
+
+describe Rack::Test::UploadedFile do
+  def test_file_path
+    File.dirname(__FILE__) + "/../../fixtures/foo.txt"
+  end
+
+  it "responds to things that Tempfile responds to" do
+    uploaded_file = Rack::Test::UploadedFile.new(test_file_path)
+
+    uploaded_file.should respond_to(:close)
+    uploaded_file.should respond_to(:close!)
+    uploaded_file.should respond_to(:delete)
+    uploaded_file.should respond_to(:length)
+    uploaded_file.should respond_to(:open)
+    uploaded_file.should respond_to(:path)
+    uploaded_file.should respond_to(:size)
+    uploaded_file.should respond_to(:unlink)
+    uploaded_file.should respond_to(:read)
+  end
+
+end

data/spec/rack/test/utils_spec.rb

@@ -89,7 +89,7 @@ describe Rack::Test::Utils do
 
     it "builds nested multipart bodies" do
       files = Rack::Test::UploadedFile.new(multipart_file("foo.txt"))
-      data  = build_multipart("people" => [{"submit-name" => "Larry", "files" => files}])
+      data  = build_multipart("people" => [{"submit-name" => "Larry", "files" => files}], "foo" => ['1', '2'])
 
       options = {
         "CONTENT_TYPE" => "multipart/form-data; boundary=#{Rack::Test::MULTIPART_BOUNDARY}",
@@ -101,6 +101,7 @@ describe Rack::Test::Utils do
       check params["people"][0]["submit-name"].should == "Larry"
       check params["people"][0]["files"][:filename].should == "foo.txt"
       params["people"][0]["files"][:tempfile].read.should == "bar\n"
+      check params["foo"].should == ["1", "2"]
     end
 
     it "returns nil if no UploadedFiles were used" do

data/spec/rack/test_spec.rb

@@ -228,7 +228,7 @@ describe Rack::Test::Session do
 
       last_request.env["CONTENT_TYPE"].should == "application/json"
     end
-    
+
     it "sets a Host to be sent with requests" do
       header "Host", "www.example.ua"
       request "/"
@@ -292,6 +292,7 @@ describe Rack::Test::Session do
 
       last_response.should_not be_redirect
       last_response.body.should == "You've been redirected"
+      last_request.env["HTTP_REFERER"].should eql("http://example.org/redirect")
     end
 
     it "does not include params when following the redirect" do

data/spec/spec_helper.rb

@@ -9,7 +9,7 @@ Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
 require "rack/test"
 require File.dirname(__FILE__) + "/fixtures/fake_app"
 
-Rspec.configure do |config|
+RSpec.configure do |config|
   config.mock_with :rspec
   config.include Rack::Test::Methods
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-test
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Bryan Helmkamp
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-03 00:00:00 -04:00
+date: 2011-07-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,6 +71,7 @@ files:
 - spec/rack/test/cookie_spec.rb
 - spec/rack/test/digest_auth_spec.rb
 - spec/rack/test/multipart_spec.rb
+- spec/rack/test/uploaded_file_spec.rb
 - spec/rack/test/utils_spec.rb
 - spec/rack/test_spec.rb
 - spec/spec_helper.rb
@@ -115,6 +116,7 @@ test_files:
 - spec/rack/test/cookie_spec.rb
 - spec/rack/test/digest_auth_spec.rb
 - spec/rack/test/multipart_spec.rb
+- spec/rack/test/uploaded_file_spec.rb
 - spec/rack/test/utils_spec.rb
 - spec/rack/test_spec.rb
 - spec/spec_helper.rb