Specify regex using Regex type

Author: sksamuel

src/main/kotlin/io/kotest/extensions/httpstub/dsl.kt

@@ -31,38 +31,73 @@ class HttpStubber(private val server: WireMockServer) {
       server.stubFor(builder.willReturn(resp.toReturnBuilder()))
    }
 
+   fun get(url: Regex, fn: RequestStubber.() -> HttpResponse) {
+      val builder = WireMock.get(WireMock.urlMatching(url.pattern))
+      stub(builder, fn)
+   }
+
    fun get(url: String, fn: RequestStubber.() -> HttpResponse) {
-      val builder = WireMock.get(WireMock.urlMatching(url))
+      val builder = WireMock.get(WireMock.urlEqualTo(url))
+      stub(builder, fn)
+   }
+
+   fun post(url: Regex, fn: RequestStubber.() -> HttpResponse) {
+      val builder = WireMock.post(WireMock.urlMatching(url.pattern))
       stub(builder, fn)
    }
 
    fun post(url: String, fn: RequestStubber.() -> HttpResponse) {
-      val builder = WireMock.post(WireMock.urlMatching(url))
+      val builder = WireMock.post(WireMock.urlEqualTo(url))
+      stub(builder, fn)
+   }
+
+   fun patch(url: Regex, fn: RequestStubber.() -> HttpResponse) {
+      val builder = WireMock.patch(WireMock.urlMatching(url.pattern))
       stub(builder, fn)
    }
 
    fun patch(url: String, fn: RequestStubber.() -> HttpResponse) {
-      val builder = WireMock.patch(WireMock.urlMatching(url))
+      val builder = WireMock.patch(WireMock.urlEqualTo(url))
+      stub(builder, fn)
+   }
+
+   fun head(url: Regex, fn: RequestStubber.() -> HttpResponse) {
+      val builder = WireMock.head(WireMock.urlMatching(url.pattern))
       stub(builder, fn)
    }
 
    fun head(url: String, fn: RequestStubber.() -> HttpResponse) {
-      val builder = WireMock.head(WireMock.urlMatching(url))
+      val builder = WireMock.head(WireMock.urlEqualTo(url))
+      stub(builder, fn)
+   }
+
+   fun options(url: Regex, fn: RequestStubber.() -> HttpResponse) {
+      val builder = WireMock.options(WireMock.urlMatching(url.pattern))
       stub(builder, fn)
    }
 
    fun options(url: String, fn: RequestStubber.() -> HttpResponse) {
-      val builder = WireMock.options(WireMock.urlMatching(url))
+      val builder = WireMock.options(WireMock.urlEqualTo(url))
+      stub(builder, fn)
+   }
+
+   fun put(url: Regex, fn: RequestStubber.() -> HttpResponse) {
+      val builder = WireMock.put(WireMock.urlMatching(url.pattern))
       stub(builder, fn)
    }
 
    fun put(url: String, fn: RequestStubber.() -> HttpResponse) {
-      val builder = WireMock.put(WireMock.urlMatching(url))
+      val builder = WireMock.put(WireMock.urlEqualTo(url))
+      stub(builder, fn)
+   }
+
+   fun delete(url: Regex, fn: RequestStubber.() -> HttpResponse) {
+      val builder = WireMock.delete(WireMock.urlMatching(url.pattern))
       stub(builder, fn)
    }
 
    fun delete(url: String, fn: RequestStubber.() -> HttpResponse) {
-      val builder = WireMock.delete(WireMock.urlMatching(url))
+      val builder = WireMock.delete(WireMock.urlEqualTo(url))
       stub(builder, fn)
    }
 

src/test/kotlin/io/kotest/extensions/httpstub/RegexPathTest.kt

@@ -6,6 +6,7 @@ import io.kotest.matchers.shouldBe
 import io.ktor.client.HttpClient
 import io.ktor.client.engine.apache.Apache
 import io.ktor.client.request.get
+import io.ktor.client.request.post
 import io.ktor.http.HttpStatusCode
 
 class RegexPathTest : FunSpec() {
@@ -18,7 +19,7 @@ class RegexPathTest : FunSpec() {
 
       test("with regex path") {
          server.mappings {
-            get("/foo/.*") {
+            get("/foo/.*".toRegex()) {
                ok()
             }
          }
@@ -27,13 +28,29 @@ class RegexPathTest : FunSpec() {
          server.invokedEndpoints() shouldBe listOf("/foo/a")
       }
 
+      test("regex special characters should work when not using regex") {
+         server.mappings {
+            get("/foo/*") {
+               ok()
+            }
+            post("/bar?q=a") {
+               ok()
+            }
+         }
+         val resp1 = client.get(server.url("/foo/*"))
+         val resp2 = client.post(server.url("/bar?q=a"))
+         resp1.status shouldBe HttpStatusCode.OK
+         resp2.status shouldBe HttpStatusCode.OK
+         server.invokedEndpoints() shouldBe listOf("/foo/*", "/bar?q=a")
+      }
+
       test("regex path with multiple parts") {
          server.mappings {
-            get("/foo/.*/.*") {
+            post("/foo/.*/.*".toRegex()) {
                ok()
             }
          }
-         val resp = client.get(server.url("/foo/a/b"))
+         val resp = client.post(server.url("/foo/a/b"))
          resp.status shouldBe HttpStatusCode.OK
          server.invokedEndpoints() shouldBe listOf("/foo/a/b")
       }