mirror of
https://github.com/google/nomulus.git
synced 2025-05-16 09:27:16 +02:00
Decouple superuser from SessionMetadata
Superuser should only be settable via the tool (see [] which is merged in here but not diffbased, and which removes the implicit superuser for CharlestonRoad). It is a property of the request, not of the session (there are no sessions in the tool). ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=125204707
This commit is contained in:
parent
e359ab5f52
commit
fd6c4888db
44 changed files with 80 additions and 136 deletions
|
@ -16,8 +16,8 @@ package google.registry.flows;
|
|||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static java.nio.charset.StandardCharsets.UTF_8;
|
||||
import static org.mockito.Matchers.eq;
|
||||
import static org.mockito.Matchers.isA;
|
||||
import static org.mockito.Mockito.eq;
|
||||
import static org.mockito.Mockito.isA;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
|
@ -30,11 +30,11 @@ import org.mockito.ArgumentCaptor;
|
|||
@RunWith(JUnit4.class)
|
||||
public class EppToolActionTest {
|
||||
|
||||
private void doTest(boolean dryRun, boolean superuser) {
|
||||
private void doTest(boolean isDryRun, boolean isSuperuser) {
|
||||
EppToolAction action = new EppToolAction();
|
||||
action.clientIdentifier = "ClientIdentifier";
|
||||
action.dryRun = dryRun;
|
||||
action.superuser = superuser;
|
||||
action.isDryRun = isDryRun;
|
||||
action.isSuperuser = isSuperuser;
|
||||
action.eppRequestHandler = mock(EppRequestHandler.class);
|
||||
action.xml = "<xml>";
|
||||
action.run();
|
||||
|
@ -42,11 +42,10 @@ public class EppToolActionTest {
|
|||
verify(action.eppRequestHandler).executeEpp(
|
||||
captor.capture(),
|
||||
isA(PasswordOnlyTransportCredentials.class),
|
||||
eq(dryRun),
|
||||
eq(isDryRun),
|
||||
eq(isSuperuser),
|
||||
eq(action.xml.getBytes(UTF_8)));
|
||||
SessionMetadata sessionMetadata = captor.getValue();
|
||||
assertThat(sessionMetadata.getClientId()).isEqualTo("ClientIdentifier");
|
||||
assertThat(sessionMetadata.isSuperuser()).isEqualTo(superuser);
|
||||
assertThat(captor.getValue().getClientId()).isEqualTo("ClientIdentifier");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue