Inject ApplicationContext not WebApplicationContext with WebTestClient

Closes gh-582

docs/src/test/java/com/example/webtestclient/CustomDefaultOperationPreprocessors.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -19,9 +19,9 @@ package com.example.webtestclient;
 import org.junit.Before;
 import org.junit.Rule;
 
+import org.springframework.context.ApplicationContext;
 import org.springframework.restdocs.JUnitRestDocumentation;
 import org.springframework.test.web.reactive.server.WebTestClient;
-import org.springframework.web.context.WebApplicationContext;
 
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint;
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.removeHeaders;
@@ -34,7 +34,7 @@ public class CustomDefaultOperationPreprocessors {
 	@Rule
 	public final JUnitRestDocumentation restDocumentation = new JUnitRestDocumentation();
 
-	private WebApplicationContext context;
+	private ApplicationContext context;
 
 	@SuppressWarnings("unused")
 	private WebTestClient webTestClient;

docs/src/test/java/com/example/webtestclient/CustomDefaultSnippets.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -20,9 +20,9 @@ import org.junit.Before;
 import org.junit.Rule;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.restdocs.JUnitRestDocumentation;
 import org.springframework.test.web.reactive.server.WebTestClient;
-import org.springframework.web.context.WebApplicationContext;
 
 import static org.springframework.restdocs.cli.CliDocumentation.curlRequest;
 import static org.springframework.restdocs.webtestclient.WebTestClientRestDocumentation.documentationConfiguration;
@@ -35,7 +35,7 @@ public class CustomDefaultSnippets {
 	public final JUnitRestDocumentation restDocumentation = new JUnitRestDocumentation();
 
 	@Autowired
-	private WebApplicationContext context;
+	private ApplicationContext context;
 
 	@SuppressWarnings("unused")
 	private WebTestClient webTestClient;

docs/src/test/java/com/example/webtestclient/CustomEncoding.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -20,9 +20,9 @@ import org.junit.Before;
 import org.junit.Rule;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.restdocs.JUnitRestDocumentation;
 import org.springframework.test.web.reactive.server.WebTestClient;
-import org.springframework.web.context.WebApplicationContext;
 
 import static org.springframework.restdocs.webtestclient.WebTestClientRestDocumentation.documentationConfiguration;
 
@@ -34,7 +34,7 @@ public class CustomEncoding {
 	public final JUnitRestDocumentation restDocumentation = new JUnitRestDocumentation();
 
 	@Autowired
-	private WebApplicationContext context;
+	private ApplicationContext context;
 
 	@SuppressWarnings("unused")
 	private WebTestClient webTestClient;

docs/src/test/java/com/example/webtestclient/CustomFormat.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -20,10 +20,10 @@ import org.junit.Before;
 import org.junit.Rule;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.restdocs.JUnitRestDocumentation;
 import org.springframework.restdocs.templates.TemplateFormats;
 import org.springframework.test.web.reactive.server.WebTestClient;
-import org.springframework.web.context.WebApplicationContext;
 
 import static org.springframework.restdocs.webtestclient.WebTestClientRestDocumentation.documentationConfiguration;
 
@@ -35,7 +35,7 @@ public class CustomFormat {
 	public final JUnitRestDocumentation restDocumentation = new JUnitRestDocumentation();
 
 	@Autowired
-	private WebApplicationContext context;
+	private ApplicationContext context;
 
 	@SuppressWarnings("unused")
 	private WebTestClient webTestClient;

docs/src/test/java/com/example/webtestclient/CustomUriConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -20,9 +20,9 @@ import org.junit.Before;
 import org.junit.Rule;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.restdocs.JUnitRestDocumentation;
 import org.springframework.test.web.reactive.server.WebTestClient;
-import org.springframework.web.context.WebApplicationContext;
 
 import static org.springframework.restdocs.webtestclient.WebTestClientRestDocumentation.documentationConfiguration;
 
@@ -35,7 +35,7 @@ public class CustomUriConfiguration {
 	private WebTestClient webTestClient;
 
 	@Autowired
-	private WebApplicationContext context;
+	private ApplicationContext context;
 
 	// tag::custom-uri-configuration[]
 	@Before

docs/src/test/java/com/example/webtestclient/EveryTestPreprocessing.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -19,9 +19,9 @@ package com.example.webtestclient;
 import org.junit.Before;
 import org.junit.Rule;
 
+import org.springframework.context.ApplicationContext;
 import org.springframework.restdocs.JUnitRestDocumentation;
 import org.springframework.test.web.reactive.server.WebTestClient;
-import org.springframework.web.context.WebApplicationContext;
 
 import static org.springframework.restdocs.hypermedia.HypermediaDocumentation.linkWithRel;
 import static org.springframework.restdocs.hypermedia.HypermediaDocumentation.links;
@@ -37,7 +37,7 @@ public class EveryTestPreprocessing {
 	@Rule
 	public final JUnitRestDocumentation restDocumentation = new JUnitRestDocumentation();
 
-	private WebApplicationContext context;
+	private ApplicationContext context;
 
 	// tag::setup[]
 	private WebTestClient webTestClient;

docs/src/test/java/com/example/webtestclient/ExampleApplicationJUnit5Tests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -19,10 +19,10 @@ package com.example.webtestclient;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.extension.ExtendWith;
 
+import org.springframework.context.ApplicationContext;
 import org.springframework.restdocs.RestDocumentationContextProvider;
 import org.springframework.restdocs.RestDocumentationExtension;
 import org.springframework.test.web.reactive.server.WebTestClient;
-import org.springframework.web.context.WebApplicationContext;
 
 import static org.springframework.restdocs.webtestclient.WebTestClientRestDocumentation.documentationConfiguration;
 
@@ -34,9 +34,9 @@ public class ExampleApplicationJUnit5Tests {
 	private WebTestClient webTestClient;
 
 	@BeforeEach
-	public void setUp(WebApplicationContext webApplicationContext,
+	public void setUp(ApplicationContext applicationContext,
 			RestDocumentationContextProvider restDocumentation) {
-		this.webTestClient = WebTestClient.bindToApplicationContext(webApplicationContext)
+		this.webTestClient = WebTestClient.bindToApplicationContext(applicationContext)
 				.configureClient()
 				.filter(documentationConfiguration(restDocumentation)) // <1>
 				.build();

docs/src/test/java/com/example/webtestclient/ExampleApplicationTestNgTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -22,9 +22,9 @@ import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.restdocs.ManualRestDocumentation;
 import org.springframework.test.web.reactive.server.WebTestClient;
-import org.springframework.web.context.WebApplicationContext;
 
 import static org.springframework.restdocs.webtestclient.WebTestClientRestDocumentation.documentationConfiguration;
 
@@ -37,7 +37,7 @@ public class ExampleApplicationTestNgTests {
 	private WebTestClient webTestClient;
 
 	@Autowired
-	private WebApplicationContext context;
+	private ApplicationContext context;
 
 	@BeforeMethod
 	public void setUp(Method method) {

docs/src/test/java/com/example/webtestclient/ExampleApplicationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -20,9 +20,9 @@ import org.junit.Before;
 import org.junit.Rule;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.restdocs.JUnitRestDocumentation;
 import org.springframework.test.web.reactive.server.WebTestClient;
-import org.springframework.web.context.WebApplicationContext;
 
 import static org.springframework.restdocs.webtestclient.WebTestClientRestDocumentation.documentationConfiguration;
 
@@ -36,7 +36,7 @@ public class ExampleApplicationTests {
 	private WebTestClient webTestClient;
 
 	@Autowired
-	private WebApplicationContext context;
+	private ApplicationContext context;
 
 	@Before
 	public void setUp() {