/test/valid/series-info/new-seller: port to using WireMock stub.

php-coder · php-coder · commit d3f6dc82ff06 · 2018-08-06T12:15:48.000+01:00
Also add &lt;meta charset&gt; tag to fix dislaying of the page in a browser.

No functional changes.
diff --git a/src/main/java/ru/mystamps/web/controller/TestController.java b/src/main/java/ru/mystamps/web/controller/TestController.java
@@ -51,26 +51,4 @@ public void seriesInfoWithExistingSeller(HttpServletResponse response) throws IO
 		);
 	}
 	
-	@GetMapping("/test/valid/series-info/new-seller")
-	public void seriesInfoWithNewSeller(HttpServletResponse response) throws IOException {
-		printHtml(
-			response,
-			"<!DOCTYPE html>"
-			+ "<html>"
-				+ "<head>"
-					+ "<title>Series info (new seller)</title>"
-				+ "</head>"
-				+ "<body>"
-					// CheckStyle: ignore LineLength for next 2 lines
-					+ "Image:  <a id=\"series-image-link-1\" href=\"/image/1\">series image</a><br />"
-					+ "Seller: <a id=\"test-seller\" href=\"http://example.com/lando-livianus\">Lando Livianus</a><br />"
-					+ "Price:  <span id=\"test-price\">320.5</span> RUB<br />"
-					// this is needed to simplify an integration test
-					// (required fields "category" and "quantity" will be filled automatically)
-					+ "Info:   <span class=\"dl-horizontal\">Спорт, 7 марок</span>"
-				+ "</body>"
-			+ "</html>"
-		);
-	}
-	
 }
diff --git a/src/test/robotframework/series/import/request-logic.robot b/src/test/robotframework/series/import/request-logic.robot
@@ -112,7 +112,7 @@ Import series and series sale with existing seller from an external site
 
 Import series and series sale with a new seller from an external site
 	[Documentation]             Verify import series and sale (with a new seller)
-	Input Text                  id=url  http://localhost:8080/test/valid/series-info/new-seller
+	Input Text                  id=url  ${MOCK_SERVER}/series/import/request-logic/new-seller.html
 	Submit Form                 id=import-series-form
 	${requestLocation}=         Get Location
 	Should Match Regexp         ${requestLocation}  /series/import/request/\\d+
diff --git a/src/test/wiremock/__files/series/import/request-logic/new-seller.html b/src/test/wiremock/__files/series/import/request-logic/new-seller.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8" />
+		<title>Series info (new seller)</title>
+	</head>
+	<body>
+		Image:  <a id="series-image-link-1" href="http://127.0.0.1:8080/image/1">series image</a><br />
+		Seller: <a id="test-seller" href="http://example.com/lando-livianus">Lando Livianus</a><br />
+		Price:  <span id="test-price">320.5</span> RUB<br />
+		<!--
+			This is needed to simplify an integration test:
+			required fields "category" and "quantity" will be filled automatically
+		-->
+		Info:   <span class="dl-horizontal">Спорт, 7 марок</span>
+	</body>
+</html>
