url should not trim trailing f-slash #1561

Author: ptrthomas

karate-core/src/main/java/com/intuit/karate/http/HttpRequestBuilder.java

@@ -259,23 +259,24 @@ public HttpRequestBuilder path(String path) {
         return this;
     }
 
-    private String getUri() {
+    public String getUri() {
         try {
             URIBuilder builder;
             if (url == null) {
                 builder = new URIBuilder();
             } else {
-                if (url.endsWith("/")) {
-                    url = url.substring(0, url.length() - 1);
-                }
                 builder = new URIBuilder(url);
             }
             if (params != null) {
                 params.forEach((key, values) -> values.forEach(value -> builder.addParameter(key, value)));
             }
             if (paths != null) {
                 List<String> segments = new ArrayList();
-                segments.addAll(builder.getPathSegments());
+                for (String item : builder.getPathSegments()) {
+                    if (!item.isEmpty()) {
+                        segments.add(item);
+                    }
+                }                
                 for (String item : paths) {
                     for (String s : StringUtils.split(item, '/', true)) {
                         segments.add(s);

karate-core/src/test/java/com/intuit/karate/http/HttpRequestBuilderTest.java

@@ -0,0 +1,42 @@
+package com.intuit.karate.http;
+
+import com.intuit.karate.core.ScenarioEngine;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * @author pthomas3
+ */
+class HttpRequestBuilderTest {
+    
+    static final Logger logger = LoggerFactory.getLogger(HttpRequestBuilderTest.class);
+    
+    HttpRequestBuilder http;
+    
+    @BeforeEach
+    void beforeEach() {
+        ScenarioEngine se = ScenarioEngine.forTempUse();
+        http = new HttpRequestBuilder(HttpClientFactory.DEFAULT.create(se));
+    }
+    
+    @Test
+    void testUrlAndPath() {
+        http.url("http://host/foo");
+        assertEquals("http://host/foo", http.getUri());
+        http.path("/bar");
+        assertEquals("http://host/foo/bar", http.getUri());        
+    }
+    
+    @Test
+    void testUrlAndPathWithSlash() {
+        http.url("http://host/foo/");
+        assertEquals("http://host/foo/", http.getUri());
+        http.path("/bar/");
+        assertEquals("http://host/foo/bar", http.getUri());        
+    }    
+    
+}