From 429a44f94296459d5f5b7d7c085eaa063e7b41ca Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Wed, 1 Apr 2020 15:14:55 -0400
Subject: [PATCH] Adds CookieRoutePredicateFactoryIntegrationTests

---
 ...RoutePredicateFactoryIntegrationTests.java | 67 +++++++++++++++++++
 .../src/test/resources/application.yml        |  7 ++
 2 files changed, 74 insertions(+)
 create mode 100644 spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/handler/predicate/CookieRoutePredicateFactoryIntegrationTests.java

diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/handler/predicate/CookieRoutePredicateFactoryIntegrationTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/handler/predicate/CookieRoutePredicateFactoryIntegrationTests.java
new file mode 100644
index 00000000..fb5cc054
--- /dev/null
+++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/handler/predicate/CookieRoutePredicateFactoryIntegrationTests.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.gateway.handler.predicate;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.gateway.test.BaseWebClientTests;
+import org.springframework.context.annotation.Import;
+import org.springframework.http.HttpHeaders;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.web.bind.annotation.CookieValue;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = RANDOM_PORT)
+public class CookieRoutePredicateFactoryIntegrationTests extends BaseWebClientTests {
+
+	@Test
+	public void cookieRegexWorks() {
+		assertCookieValue("helloaaaaa");
+
+		assertCookieValue("hello");
+	}
+
+	private void assertCookieValue(String value) {
+		testClient.get().uri("/cookie").header(HttpHeaders.HOST, "www.cookieregex.org")
+				.cookie("mycookie", value)
+				.exchange().expectStatus().isOk()
+				.expectHeader()
+				.valueEquals(ROUTE_ID_HEADER, "cookie_regex_test")
+				.expectBody(String.class).isEqualTo(value);
+	}
+
+	@EnableAutoConfiguration
+	@SpringBootConfiguration
+	@Import(DefaultTestConfig.class)
+	@RestController
+	public static class TestConfig {
+
+		@GetMapping("/httpbin/cookie")
+		public String cookie(@CookieValue("mycookie") String mycookie) {
+			return mycookie;
+		}
+
+	}
+}
diff --git a/spring-cloud-gateway-core/src/test/resources/application.yml b/spring-cloud-gateway-core/src/test/resources/application.yml
index e82c6d44..97310680 100644
--- a/spring-cloud-gateway-core/src/test/resources/application.yml
+++ b/spring-cloud-gateway-core/src/test/resources/application.yml
@@ -107,6 +107,13 @@ spring:
         filters:
           - RequestHeaderToRequestUri=X-CF-Forwarded-Url
 
+        # =====================================
+      - id: cookie_regex_test
+        uri: ${test.uri}
+        predicates:
+          - Host=**.cookieregex.org
+          - Cookie=mycookie, hello.*
+
       # =====================================
       - id: dedupe_response_header_test
         uri: ${test.uri}