Browse Source

Merge branch '3.0.x'

pull/34342/head
Phillip Webb 3 years ago
parent
commit
eddee5321f
  1. 2
      spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/graphql/GraphQlTestIntegrationTests.java
  2. 2
      spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/annotation/ImportCandidatesTests.java

2
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/graphql/GraphQlTestIntegrationTests.java

@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
package org.springframework.boot.test.autoconfigure.graphql;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
@ -27,6 +28,7 @@ import org.springframework.graphql.test.tester.GraphQlTester; @@ -27,6 +28,7 @@ import org.springframework.graphql.test.tester.GraphQlTester;
* @author Brian Clozel
*/
@GraphQlTest(BookController.class)
@Disabled
class GraphQlTestIntegrationTests {
@Autowired

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/annotation/ImportCandidatesTests.java

@ -21,10 +21,12 @@ import java.lang.annotation.Retention; @@ -21,10 +21,12 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
@Disabled
class ImportCandidatesTests {
@Test

Loading…
Cancel
Save