Fix: update testcase, only assurers may become org admins.

Therefore the testcase should test with assurers.

diff --git a/tests/org/cacert/gigi/pages/orga/TestOrgaManagement.java b/tests/org/cacert/gigi/pages/orga/TestOrgaManagement.java
index f0a07a801d39e24ff8c2d912834c36061385000e..ccb941453c278369b43abd14b2b910ca47167266 100644 (file)
--- a/tests/org/cacert/gigi/pages/orga/TestOrgaManagement.java
+++ b/tests/org/cacert/gigi/pages/orga/TestOrgaManagement.java
@@ -22,6 +22,7 @@ public class TestOrgaManagement extends ClientTest {
 
     public TestOrgaManagement() throws IOException {
         u.grantGroup(u, Group.getByString("orgassurer"));
+        makeAssurer(u.getId());
         clearCaches();
         cookie = login(email, TEST_PASSWORD);
     }
@@ -36,7 +37,7 @@ public class TestOrgaManagement extends ClientTest {
         assertEquals("Köln", orgs[0].getCity());
         assertEquals("ÜÖÄß", orgs[0].getProvince());
 
-        User u2 = User.getById(createVerifiedUser("testworker", "testname", createUniqueName() + "@testdom.com", TEST_PASSWORD));
+        User u2 = User.getById(createAssuranceUser("testworker", "testname", createUniqueName() + "@testdom.com", TEST_PASSWORD));
         executeBasicWebInteraction(cookie, ViewOrgPage.DEFAULT_PATH + "/" + orgs[0].getId(), "email=" + URLEncoder.encode(u2.getEmail(), "UTF-8") + "&do_affiliate=y&master=y", 1);
         List<Affiliation> allAdmins = orgs[0].getAllAdmins();
         assertEquals(1, allAdmins.size());

diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java
index 584b10e42c5dba8aaf733727184a21605ed7a7c7..45b904429dbe1dc4d371ff57e0cd7790a44e762b 100644 (file)
--- a/tests/org/cacert/gigi/testUtils/ManagedTest.java
+++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java
@@ -311,6 +311,12 @@ public class ManagedTest extends ConfiguredTest {
     public static int createAssuranceUser(String firstName, String lastName, String email, String password) {
         int uid = createVerifiedUser(firstName, lastName, email, password);
 
+        makeAssurer(uid);
+
+        return uid;
+    }
+
+    public static void makeAssurer(int uid) {
         GigiPreparedStatement ps1 = DatabaseConnection.getInstance().prepare("INSERT INTO `cats_passed` SET `user_id`=?, `variant_id`=?");
         ps1.setInt(1, uid);
         ps1.setInt(2, 0);
@@ -320,8 +326,6 @@ public class ManagedTest extends ConfiguredTest {
         ps2.setInt(1, uid);
         ps2.setInt(2, uid);
         ps2.execute();
-
-        return uid;
     }
 
     static String stripCookie(String headerField) {