Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-09-03 04:26:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.1.x'

Browse Source
This commit is contained in:
Andy Wilkinson 2014-07-15 14:38:02 +01:00
commit db2b20879d
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-dependencies/pom.xml
View File

@ -949,6 +949,11 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.spockframework</groupId>
<artifactId>spock-spring</artifactId>
<version>${spock.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>

7
spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View File

@ -2005,8 +2005,11 @@ the actual port that was allocated for the duration of the tests.
[[boot-features-testing-spring-boot-applications-with-spock]]
==== Using Spock to test Spring Boot applications
If you wish to use Spock to test a Spring Boot application then you cannot use the
`@SpringApplicationConfiguration` annotation that was
If you wish to use Spock to test a Spring Boot application you should add a dependency
on Spock's `spock-spring` module to your application's build. `spock-spring` integrates
Spring's test framework into Spock.
Please note that you cannot use the `@SpringApplicationConfiguration` annotation that was
<<boot-features-testing-spring-boot-applications,described above>> as Spock
https://code.google.com/p/spock/issues/detail?id=349[does not find the
`@ContextConfiguration` meta-annotation]. To work around this limitation, you should use