/test/invalid/simple-html: port to using WireMock stub.

php-coder · php-coder · commit 4c6a9f404f64 · 2018-08-06T11:40:12.000+01:00
No functional changes.
diff --git a/pom.xml b/pom.xml
@@ -987,6 +987,7 @@
 						<variable>BROWSER:htmlunitwithjs</variable>
 						<variable>MAIN_RESOURCE_DIR:${basedir}/src/main/resources/test</variable>
 						<variable>TEST_RESOURCE_DIR:${basedir}/src/test/resources</variable>
+						<variable>MOCK_SERVER:http://127.0.0.1:8888</variable>
 						<!-- See also ru.mystamps.web.Url.SITE constant -->
 						<variable>SITE_URL:http://127.0.0.1:8080</variable>
 					</variables>
diff --git a/src/main/java/ru/mystamps/web/controller/TestController.java b/src/main/java/ru/mystamps/web/controller/TestController.java
@@ -60,14 +60,6 @@ public String simpleJson() {
 		return "test";
 	}
 	
-	@GetMapping("/test/invalid/simple-html")
-	public void simpleHtml(HttpServletResponse response) throws IOException {
-		printHtml(
-			response,
-			"<!DOCTYPE html><html><head><title>test</title></head><body>test</body></html>"
-		);
-	}
-	
 	@GetMapping("/test/valid/series-info/existing-seller")
 	public void seriesInfoWithExistingSeller(HttpServletResponse response) throws IOException {
 		printHtml(
diff --git a/src/main/resources/application-test.properties b/src/main/resources/application-test.properties
@@ -59,6 +59,14 @@ app.site-parser[1].seller-locator = #test-seller
 app.site-parser[1].price-locator = #test-price
 app.site-parser[1].currency-value = RUB
 
+app.site-parser[2].name = mockserver
+app.site-parser[2].matched-url = http://127.0.0.1:8888
+app.site-parser[2].image-url-locator = #series-image-link-1
+app.site-parser[2].short-description-locator = .dl-horizontal
+app.site-parser[2].seller-locator = #test-seller
+app.site-parser[2].price-locator = #test-price
+app.site-parser[2].currency-value = RUB
+
 # Full list of autoconfiguration classes:
 # http://docs.spring.io/spring-boot/docs/1.5.x/reference/html/auto-configuration-classes.html
 spring.autoconfigure.exclude: \
diff --git a/src/main/resources/application-travis.properties b/src/main/resources/application-travis.properties
@@ -56,6 +56,14 @@ app.site-parser[1].seller-locator = #test-seller
 app.site-parser[1].price-locator = #test-price
 app.site-parser[1].currency-value = RUB
 
+app.site-parser[2].name = mockserver
+app.site-parser[2].matched-url = http://127.0.0.1:8888
+app.site-parser[2].image-url-locator = #series-image-link-1
+app.site-parser[2].short-description-locator = .dl-horizontal
+app.site-parser[2].seller-locator = #test-seller
+app.site-parser[2].price-locator = #test-price
+app.site-parser[2].currency-value = RUB
+
 # Full list of autoconfiguration classes:
 # http://docs.spring.io/spring-boot/docs/1.5.x/reference/html/auto-configuration-classes.html
 # The difference between test profile is that we don't need H2ConsoleAutoConfiguration
diff --git a/src/main/scripts/ci/check-build-and-verify.sh b/src/main/scripts/ci/check-build-and-verify.sh
@@ -135,7 +135,7 @@ if [ "$RUN_ONLY_INTEGRATION_TESTS" = 'no' ]; then
 	print_status "$POM_STATUS" 'Check sorting of pom.xml'
 	
 	if [ "$BOOTLINT_STATUS" != 'skip' ]; then
-		find src -type f -name '*.html' -print0 | xargs -0 bootlint \
+		find src/main -type f -name '*.html' -print0 | xargs -0 bootlint \
 			>bootlint.log 2>&1 || BOOTLINT_STATUS=fail
 	fi
 	print_status "$BOOTLINT_STATUS" 'Run bootlint'
diff --git a/src/test/robotframework/series/import/request-logic.robot b/src/test/robotframework/series/import/request-logic.robot
@@ -145,7 +145,7 @@ Submit a request that will fail to download a file
 
 Submit a request with a document that couldn't be parsed
 	[Documentation]         Verify submitting a URL with an empty HTML document
-	Input Text              id=url  ${SITE_URL}/test/invalid/simple-html
+	Input Text              id=url  ${MOCK_SERVER}/series/import/request-logic/simple.html
 	Submit Form             id=import-series-form
 	Element Text Should Be  id=request-status  ParsingFailed
 
diff --git a/src/test/wiremock/__files/series/import/request-logic/simple.html b/src/test/wiremock/__files/series/import/request-logic/simple.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>test</title>
+	</head>
+	<body>
+		test
+	</body>
+</html>

-Original file line number
+Diff line change
@@ @@ -0,0 +1,9 @@ @@
 +<!DOCTYPE html>
 +<html>
 +	<head>
 +		<title>test</title>
 +	</head>
 +	<body>
 +		test
 +	</body>
 +</html>