From 4fcac9d2cbdafb51e3ee9ca3b3da64fd86103174 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 26 Nov 2013 15:58:15 -0500
Subject: [PATCH] Remove artifact setting from manager dialog
---
src/test/java/com/gitblit/tests/RpcTests.java | 45 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/src/test/java/com/gitblit/tests/RpcTests.java b/src/test/java/com/gitblit/tests/RpcTests.java
index 3241a8a..f816ff6 100644
--- a/src/test/java/com/gitblit/tests/RpcTests.java
+++ b/src/test/java/com/gitblit/tests/RpcTests.java
@@ -37,13 +37,14 @@
import com.gitblit.Constants.AuthorizationControl;
import com.gitblit.Constants.PermissionType;
import com.gitblit.Constants.RegistrantType;
+import com.gitblit.GitBlitException.NotAllowedException;
import com.gitblit.GitBlitException.UnauthorizedException;
import com.gitblit.Keys;
import com.gitblit.RpcServlet;
-import com.gitblit.models.RegistrantAccessPermission;
import com.gitblit.models.FederationModel;
import com.gitblit.models.FederationProposal;
import com.gitblit.models.FederationSet;
+import com.gitblit.models.RegistrantAccessPermission;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.ServerSettings;
import com.gitblit.models.ServerStatus;
@@ -53,9 +54,9 @@
/**
* Tests all the rpc client utility methods, the rpc filter and rpc servlet.
- *
+ *
* @author James Moger
- *
+ *
*/
public class RpcTests {
@@ -101,6 +102,20 @@
list = RpcUtils.getUsers(url, "admin", "admin".toCharArray());
assertTrue("User list is empty!", list.size() > 0);
+ }
+
+ @Test
+ public void testGetUser() throws IOException {
+ UserModel user = null;
+ try {
+ user = RpcUtils.getUser("admin", url, null, null);
+ } catch (NotAllowedException e) {
+ }
+ assertNull("Server allows anyone to get user!", user);
+
+ user = RpcUtils.getUser("admin", url, "admin", "admin".toCharArray());
+ assertEquals("User is not the admin!", "admin", user.username);
+ assertTrue("User is not an administrator!", user.canAdmin());
}
@Test
@@ -172,6 +187,7 @@
model.authorizationControl = AuthorizationControl.AUTHENTICATED;
// create
+ RpcUtils.deleteRepository(model, url, account, password.toCharArray());
assertTrue("Failed to create repository!",
RpcUtils.createRepository(model, url, account, password.toCharArray()));
@@ -183,15 +199,22 @@
// rename and change access restriciton
String originalName = model.name;
model.name = "garbagerepo2.git";
- model.accessRestriction = AccessRestrictionType.PUSH;
+ model.accessRestriction = AccessRestrictionType.CLONE;
model.authorizationControl = AuthorizationControl.NAMED;
+ RpcUtils.deleteRepository(model, url, account, password.toCharArray());
assertTrue("Failed to update repository!", RpcUtils.updateRepository(originalName, model,
url, account, password.toCharArray()));
retrievedRepository = findRepository(model.name);
assertNotNull("Failed to find " + model.name, retrievedRepository);
assertTrue("Access retriction type is wrong",
- AccessRestrictionType.PUSH.equals(retrievedRepository.accessRestriction));
+ AccessRestrictionType.CLONE.equals(retrievedRepository.accessRestriction));
+
+ // restore VIEW restriction
+ retrievedRepository.accessRestriction = AccessRestrictionType.VIEW;
+ assertTrue("Failed to update repository!", RpcUtils.updateRepository(retrievedRepository.name, retrievedRepository,
+ url, account, password.toCharArray()));
+ retrievedRepository = findRepository(retrievedRepository.name);
// memberships
UserModel testMember = new UserModel("justadded");
@@ -199,8 +222,8 @@
List<RegistrantAccessPermission> permissions = RpcUtils.getRepositoryMemberPermissions(retrievedRepository, url, account,
password.toCharArray());
- assertEquals("Membership permissions is not empty!", 0, permissions.size());
- permissions.add(new RegistrantAccessPermission(testMember.username, AccessPermission.PUSH, PermissionType.EXPLICIT, RegistrantType.USER, null, true));
+ assertEquals("Unexpected permissions! " + permissions.toString(), 1, permissions.size());
+ permissions.add(new RegistrantAccessPermission(testMember.username, AccessPermission.VIEW, PermissionType.EXPLICIT, RegistrantType.USER, null, true));
assertTrue(
"Failed to set member permissions!",
RpcUtils.setRepositoryMemberPermissions(retrievedRepository, permissions, url, account,
@@ -211,7 +234,7 @@
for (RegistrantAccessPermission permission : permissions) {
if (permission.registrant.equalsIgnoreCase(testMember.username)) {
foundMember = true;
- assertEquals(AccessPermission.PUSH, permission.permission);
+ assertEquals(AccessPermission.VIEW, permission.permission);
break;
}
}
@@ -249,7 +272,7 @@
public void testTeamAdministration() throws IOException {
List<TeamModel> teams = RpcUtils.getTeams(url, account, password.toCharArray());
assertEquals(1, teams.size());
-
+
// Create the A-Team
TeamModel aTeam = new TeamModel("A-Team");
aTeam.users.add("admin");
@@ -279,7 +302,7 @@
}
}
assertNotNull(helloworld);
-
+
// Confirm that we have added the team
List<String> helloworldTeams = RpcUtils.getRepositoryTeams(helloworld, url, account,
password.toCharArray());
@@ -296,7 +319,7 @@
helloworldTeams = RpcUtils.getRepositoryTeams(helloworld, url, account,
password.toCharArray());
assertEquals(0, helloworldTeams.size());
-
+
// delete the A-Team
assertTrue(RpcUtils.deleteTeam(aTeam, url, account, password.toCharArray()));
--
Gitblit v1.9.1