Fixed bug in receive hook for repositories in subfolders

James Moger

2012-01-05 cb285cbfddfc0b633d6b8cdb4dc0d2bd2b8b51ef

 tests/com/gitblit/tests/UserServiceTest.java

@@ -57,13 +57,19 @@
      UserModel admin = service.getUserModel("admin");

      assertTrue(admin == null);



      // add admin

      // add admin and admins team

      TeamModel admins = new TeamModel("admins");

      admins.mailingLists.add("admins@localhost.com");

		
      admin = new UserModel("admin");

      admin.password = "password";

      admin.canAdmin = true;

      admin.excludeFromFederation = true;

      admin.teams.add(admins);

		
      service.updateUserModel(admin);

      admin = null;

      admins = null;



      // add new user

      UserModel newUser = new UserModel("test");

@@ -111,8 +117,9 @@


   protected void testTeams(IUserService service) {



      // confirm we have no teams

      assertEquals(0, service.getAllTeamNames().size());

      // confirm we have 1 team (admins)

      assertEquals(1, service.getAllTeamNames().size());

      assertEquals("admins", service.getAllTeamNames().get(0));



      // remove newrepo1 from test user

      // now test user has no repositories

@@ -211,6 +218,13 @@
      // delete both teams

      service.deleteTeam("testteam");

      service.deleteTeam("nextteam");

      assertEquals(0, service.getAllTeamNames().size());

		
      // assert we still have the admins team

      assertEquals(1, service.getAllTeamNames().size());

      assertEquals("admins", service.getAllTeamNames().get(0));

		
      team = service.getTeamModel("admins");

      assertEquals(1, team.mailingLists.size());

      assertTrue(team.mailingLists.contains("admins@localhost.com"));

   }

}