zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-30 01:10:14 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix semantic merge conflict (#528)

Browse source
This commit is contained in:
gbrodman 2020-03-24 12:29:11 -04:00 • committed by GitHub
parent 2998b56982
commit acf0baf048
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/src/test/java/google/registry/ui/server/registrar/RegistryLockPostActionTest.java
View file

@ -129,7 +129,7 @@ public final class RegistryLockPostActionTest {
.put("relockDurationMillis", Duration.standardDays(1).getMillis()) .put("relockDurationMillis", Duration.standardDays(1).getMillis())
.build(); .build();
Map<String, ?> response = action.handleJsonRequest(request); Map<String, ?> response = action.handleJsonRequest(request);
assertSuccess(response, "unlock", "Marla.Singer@crr.com"); assertSuccess(response, "unlock", "Marla.Singer.RegistryLock@crr.com");
RegistryLock savedUnlockRequest = getMostRecentRegistryLockByRepoId(domain.getRepoId()).get(); RegistryLock savedUnlockRequest = getMostRecentRegistryLockByRepoId(domain.getRepoId()).get();
assertThat(savedUnlockRequest.getRelockDuration()) assertThat(savedUnlockRequest.getRelockDuration())
.isEqualTo(Optional.of(Duration.standardDays(1))); .isEqualTo(Optional.of(Duration.standardDays(1)));