Browse Source

Merge branch '6.2.x'

pull/34594/head
Brian Clozel 1 year ago
parent
commit
4724020174
  1. 3
      framework-docs/modules/ROOT/pages/testing/unit.adoc
  2. 1
      src/nohttp/allowlist.lines

3
framework-docs/modules/ROOT/pages/testing/unit.adoc

@ -47,8 +47,7 @@ out-of-container tests for code that depends on environment-specific properties. @@ -47,8 +47,7 @@ out-of-container tests for code that depends on environment-specific properties.
The `org.springframework.mock.web` package contains a comprehensive set of Servlet API
mock objects that are useful for testing web contexts, controllers, and filters. These
mock objects are targeted at usage with Spring's Web MVC framework and are generally more
convenient to use than dynamic mock objects (such as https://easymock.org/[EasyMock])
or alternative Servlet API mock objects (such as http://www.mockobjects.com[MockObjects]).
convenient to use than dynamic mock objects (such as https://easymock.org/[EasyMock]).
TIP: Since Spring Framework 6.0, the mock objects in `org.springframework.mock.web` are
based on the Servlet 6.0 API.

1
src/nohttp/allowlist.lines

@ -2,6 +2,5 @@ @@ -2,6 +2,5 @@
^http://jibx.sourceforge.net.*
^http://mx4j.sourceforge.net.*
^http://objenesis.org.*
^http://www.mockobjects.com.*
^http://www.w3.org/2000/xmlns/
^http://xunitpatterns.com.*

Loading…
Cancel
Save