Fix mounting on "/s3/multipart" not working with Rails

Unlike some other web frameworks like Roda, Rails adds a trailing slash to PATH_INFO when calling mounted apps on root requests. This means that for `POST /s3/multipart`, the Uppy::S3Multipart::App will receive SCRIPT_NAME: "/s3/multipart" PATH_INFO: "/" instead of SCRIPT_NAME: "/s3/multipart" PATH_INFO: "" So we update the app to handle that trailing slash.

Fix mounting on "/s3/multipart" not working with Rails
bf2bdb1d · Janko Marohnić · de569f03 · bf2bdb1d · bf2bdb1d
Unverified Commit bf2bdb1d authored Feb 19, 2019 by Janko Marohnić
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

app.rb lib/uppy/s3_multipart/app.rb +1 -1

app_test.rb test/app_test.rb +7 -0

No files found.
--- a/lib/uppy/s3_multipart/app.rb
+++ b/lib/uppy/s3_multipart/app.rb
@@ -32,7 +32,7 @@ module Uppy
        route do |r|
          # POST /s3/multipart
-          r.post true do
+          r.post ["", true] do
            content_type = r.params["type"]
            filename     = r.params["filename"]

--- a/test/app_test.rb
+++ b/test/app_test.rb
@@ -101,6 +101,13 @@ describe Uppy::S3Multipart::App do
      assert_equal :create_multipart_upload, @s3.api_requests[0][:operation_name]
      assert_equal "public-read",            @s3.api_requests[0][:params][:acl]
    end
+    it "works with a trailing slash (for Rails)" do
+      response = app.post "/s3/multipart/"
+      assert_equal :create_multipart_upload, @s3.api_requests[0][:operation_name]
+      assert_match /^\w{32}$/,               @s3.api_requests[0][:params][:key]
+    end
  end
  describe "GET /s3/multipart/:uploadId" do