Skip to content

Commit

Permalink
Modify pass-core test container to use basic auth in wait strategy. T…
Browse files Browse the repository at this point in the history
…his is needed for new version of pass-core.
  • Loading branch information
markpatton committed Apr 16, 2024
1 parent f45de9f commit 658cd39
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public abstract class AbstractDepositSubmissionIT {
.withEnv("PASS_CORE_BASE_URL", "http://localhost:8080")
.withEnv("PASS_CORE_BACKEND_USER", "backend")
.withEnv("PASS_CORE_BACKEND_PASSWORD", "backend")
.waitingFor(Wait.forHttp("/data/grant").forStatusCode(401))
.waitingFor(Wait.forHttp("/data/grant").forStatusCode(200).withBasicCredentials("backend", "backend"))
.withExposedPorts(8080);

@Autowired protected SubmissionTestUtil submissionTestUtil;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public abstract class AbstractIntegrationTest {
.withEnv("PASS_CORE_BASE_URL", "http://localhost:8080")
.withEnv("PASS_CORE_BACKEND_USER", "backend")
.withEnv("PASS_CORE_BACKEND_PASSWORD", "backend")
.waitingFor(Wait.forHttp("/data/grant").forStatusCode(401))
.waitingFor(Wait.forHttp("/data/grant").forStatusCode(200).withBasicCredentials("backend", "backend"))
.withExposedPorts(8080);

@SpyBean protected PassClient passClient;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public abstract class NihmsSubmissionEtlITBase {
.withEnv("PASS_CORE_BASE_URL", "http://localhost:8080")
.withEnv("PASS_CORE_BACKEND_USER", "backend")
.withEnv("PASS_CORE_BACKEND_PASSWORD", "backend")
.waitingFor(Wait.forHttp("/data/grant").forStatusCode(401))
.waitingFor(Wait.forHttp("/data/grant").forStatusCode(200).withBasicCredentials("backend", "backend"))
.withExposedPorts(8080);

@DynamicPropertySource
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public class NotificationServiceIT extends AbstractNotificationSpringIntegration
.withEnv("PASS_CORE_BASE_URL", "http://localhost:8080")
.withEnv("PASS_CORE_BACKEND_USER", "backend")
.withEnv("PASS_CORE_BACKEND_PASSWORD", "backend")
.waitingFor(Wait.forHttp("/data/grant").forStatusCode(401))
.waitingFor(Wait.forHttp("/data/grant").forStatusCode(200).withBasicCredentials("backend", "backend"))
.withExposedPorts(8080);

@RegisterExtension
Expand Down

0 comments on commit 658cd39

Please sign in to comment.