From 49a8a167c71c235b3879314209ccf23aef4d2482 Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Thu, 9 May 2019 16:02:14 +0200 Subject: [PATCH] fixed tests --- .../RepositoryRoleRootResourceTest.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRoleRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRoleRootResourceTest.java index 0489717926..af968efd1f 100644 --- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRoleRootResourceTest.java +++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRoleRootResourceTest.java @@ -117,9 +117,9 @@ public class RepositoryRoleRootResourceTest { .contains( "\"name\":\"" + CUSTOM_ROLE + "\"", "\"verbs\":[\"verb\"]", - "\"self\":{\"href\":\"/v2/repository-roles/" + CUSTOM_ROLE + "\"}", - "\"update\":{\"href\":\"/v2/repository-roles/" + CUSTOM_ROLE + "\"}", - "\"delete\":{\"href\":\"/v2/repository-roles/" + CUSTOM_ROLE + "\"}" + "\"self\":{\"href\":\"/v2/repositoryRoles/" + CUSTOM_ROLE + "\"}", + "\"update\":{\"href\":\"/v2/repositoryRoles/" + CUSTOM_ROLE + "\"}", + "\"delete\":{\"href\":\"/v2/repositoryRoles/" + CUSTOM_ROLE + "\"}" ); } @@ -135,11 +135,11 @@ public class RepositoryRoleRootResourceTest { .contains( "\"name\":\"" + SYSTEM_ROLE + "\"", "\"verbs\":[\"admin\"]", - "\"self\":{\"href\":\"/v2/repository-roles/" + SYSTEM_ROLE + "\"}" + "\"self\":{\"href\":\"/v2/repositoryRoles/" + SYSTEM_ROLE + "\"}" ) .doesNotContain( - "\"delete\":{\"href\":\"/v2/repository-roles/" + CUSTOM_ROLE + "\"}", - "\"update\":{\"href\":\"/v2/repository-roles/" + CUSTOM_ROLE + "\"}" + "\"delete\":{\"href\":\"/v2/repositoryRoles/" + CUSTOM_ROLE + "\"}", + "\"update\":{\"href\":\"/v2/repositoryRoles/" + CUSTOM_ROLE + "\"}" ); } @@ -215,7 +215,7 @@ public class RepositoryRoleRootResourceTest { assertThat(createCaptor.getValue().getName()).isEqualTo("newRole"); assertThat(createCaptor.getValue().getVerbs()).containsExactly("write", "push"); Object location = response.getOutputHeaders().getFirst("Location"); - assertThat(location).isEqualTo(create("/v2/repository-roles/newRole")); + assertThat(location).isEqualTo(create("/v2/repositoryRoles/newRole")); } @Test @@ -245,12 +245,12 @@ public class RepositoryRoleRootResourceTest { "\"name\":\"" + SYSTEM_ROLE + "\"", "\"verbs\":[\"verb\"]", "\"verbs\":[\"admin\"]", - "\"self\":{\"href\":\"/v2/repository-roles", - "\"delete\":{\"href\":\"/v2/repository-roles/" + CUSTOM_ROLE + "\"}", - "\"create\":{\"href\":\"/v2/repository-roles/\"}" + "\"self\":{\"href\":\"/v2/repositoryRoles", + "\"delete\":{\"href\":\"/v2/repositoryRoles/" + CUSTOM_ROLE + "\"}", + "\"create\":{\"href\":\"/v2/repositoryRoles/\"}" ) .doesNotContain( - "\"delete\":{\"href\":\"/v2/repository-roles/" + SYSTEM_ROLE + "\"}" + "\"delete\":{\"href\":\"/v2/repositoryRoles/" + SYSTEM_ROLE + "\"}" ); }