Преглед изворни кода

SONAR-6912 add response example to api/users/deactivate

tags/6.2-RC1
Simon Brandhof пре 7 година
родитељ
комит
72170b891e

+ 1
- 0
server/sonar-server/src/main/java/org/sonar/server/user/ws/DeactivateAction.java Прегледај датотеку

@@ -69,6 +69,7 @@ public class DeactivateAction implements UsersWsAction {
.setDescription("Deactivate a user. Requires Administer System permission")
.setSince("3.7")
.setPost(true)
.setResponseExample(getClass().getResource("example-deactivate.json"))
.setHandler(this);

action.createParam("login")

+ 10
- 0
server/sonar-server/src/main/resources/org/sonar/server/user/ws/example-deactivate.json Прегледај датотеку

@@ -0,0 +1,10 @@
{
"user": {
"login": "ada.lovelace",
"name": "Ada Lovelace",
"active": false,
"local": true,
"groups": [],
"scmAccounts": []
}
}

+ 9
- 5
server/sonar-server/src/test/java/org/sonar/server/user/ws/DeactivateActionTest.java Прегледај датотеку

@@ -96,15 +96,17 @@ public class DeactivateActionTest {

@Test
public void deactivate_user_and_delete_his_related_data() throws Exception {
UserDto user = insertUser(newUserDto().setEmail("john@email.com")
.setLogin("john")
.setName("John")
.setScmAccounts(singletonList("jn")));
UserDto user = insertUser(newUserDto()
.setLogin("ada.lovelace")
.setEmail("ada.lovelace@noteg.com")
.setName("Ada Lovelace")
.setScmAccounts(singletonList("al")));
loginAsAdmin();

String json = deactivate(user.getLogin()).getInput();

assertJson(json).isSimilarTo(getClass().getResource("DeactivateActionTest/deactivate_user.json"));
// scm accounts, groups and email are deleted
assertJson(json).isSimilarTo(ws.getDef().responseExampleAsString());

assertThat(index.getNullableByLogin(user.getLogin()).active()).isFalse();
verifyThatUserIsDeactivated(user.getLogin());
@@ -246,5 +248,7 @@ public class DeactivateActionTest {
Optional<UserDto> user = db.users().selectUserByLogin(login);
assertThat(user).isPresent();
assertThat(user.get().isActive()).isFalse();
assertThat(user.get().getEmail()).isNull();
assertThat(user.get().getScmAccountsAsList()).isEmpty();
}
}

+ 0
- 9
server/sonar-server/src/test/resources/org/sonar/server/user/ws/DeactivateActionTest/deactivate_user.json Прегледај датотеку

@@ -1,9 +0,0 @@
{
"user": {
"login": "john",
"name": "John",
"scmAccounts": [],
"active": false,
"local": true
}
}

Loading…
Откажи
Сачувај