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

php-coder · php-coder · commit 5f0407e6bfc6 · 2018-08-06T14:15:37.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/config/ControllersConfig.java b/src/main/java/ru/mystamps/web/config/ControllersConfig.java
@@ -22,7 +22,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.Profile;
 
 import lombok.RequiredArgsConstructor;
 
@@ -131,11 +130,5 @@ public SitemapController getSitemapController() {
 	public SuggestionController getSuggestionController() {
 		return new SuggestionController(countryService);
 	}
-
-	@Bean
-	@Profile({ "test", "travis" })
-	public TestController getTestController() {
-		return new TestController();
-	}
 	
 }
diff --git a/src/main/java/ru/mystamps/web/controller/TestController.java b/src/main/java/ru/mystamps/web/controller/TestController.java
diff --git a/src/main/java/ru/mystamps/web/util/ControllerUtils.java b/src/main/java/ru/mystamps/web/util/ControllerUtils.java
@@ -17,10 +17,6 @@
  */
 package ru.mystamps.web.util;
 
-import java.io.IOException;
-
-import javax.servlet.http.HttpServletResponse;
-
 import org.springframework.web.util.UriComponentsBuilder;
 
 public final class ControllerUtils {
@@ -36,10 +32,4 @@ public static String redirectTo(String url, Object... args) {
 		return "redirect:" + dstUrl;
 	}
 	
-	public static void printHtml(HttpServletResponse response, String html) throws IOException {
-		response.setContentType("text/html");
-		response.setCharacterEncoding("UTF-8");
-		response.getWriter().println(html);
-	}
-	
 }
diff --git a/src/test/robotframework/series/import/request-logic.robot b/src/test/robotframework/series/import/request-logic.robot
@@ -88,7 +88,7 @@ Import series from external site with catalog numbers (use description locator)
 
 Import series and series sale with existing seller from an external site
 	[Documentation]             Verify import series and sale (with existing seller)
-	Input Text                  id=url  http://localhost:8080/test/valid/series-info/existing-seller
+	Input Text                  id=url  ${MOCK_SERVER}/series/import/request-logic/existing-seller.html
 	Submit Form                 id=import-series-form
 	${requestLocation}=         Get Location
 	Should Match Regexp         ${requestLocation}  /series/import/request/\\d+
@@ -103,7 +103,7 @@ Import series and series sale with existing seller from an external site
 	${currentDate}=             Get Current Date  result_format=%d.%m.%Y
 	Element Text Should Be      id=series-sale-1-info         ${currentDate} Eicca Toppinen was selling for 111.00 RUB
 	Link Should Point To        id=series-sale-1-seller       http://example.com/eicca-toppinen
-	Link Should Point To        id=series-sale-1-transaction  http://localhost:8080/test/valid/series-info/existing-seller
+	Link Should Point To        id=series-sale-1-transaction  ${MOCK_SERVER}/series/import/request-logic/existing-seller.html
 	Go To                       ${requestLocation}
 	# after importing a series, sale info at the request page should be shown as read-only
 	Element Should Be Disabled  id=seller
diff --git a/src/test/wiremock/__files/series/import/request-logic/existing-seller.html b/src/test/wiremock/__files/series/import/request-logic/existing-seller.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8" />
+		<title>Series info (existing 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/eicca-toppinen">Eicca Toppinen</a><br />
+		Price:  <span id="test-price">111</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">Спорт, 3 марки</span>
+	</body>
+</html>
