Merge pull request #228 from imtayadeway/squeeze-path-slashes

Squeeze consecutive slashes in the path portion of the URI
ManageIQ · Jan 8, 2018 · bef0a63 · bef0a63
2 parents 15206e1 + a72ccb9
commit bef0a63
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/lib/api/request_adapter.rb b/lib/api/request_adapter.rb
@@ -74,7 +74,7 @@ def version
     end
 
     def url
-      @request.original_url # http://target/api/...
+      @request.url # http://target/api/...
     end
 
     def prefix(version = true)
@@ -106,7 +106,7 @@ def expand_requested
     end
 
     def fullpath
-      @request.original_fullpath # /api/...&param=value...
+      @request.fullpath # /api/...&param=value...
     end
   end
 end
diff --git a/spec/requests/entrypoint_spec.rb b/spec/requests/entrypoint_spec.rb
@@ -69,4 +69,12 @@
       )
     )
   end
+
+  it "will squeeze consecutive slashes in the path portion of the URI" do
+    api_basic_authorize
+
+    get("http://www.example.com//api")
+
+    expect(response).to have_http_status(:ok)
+  end
 end