X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=tests%2Fclub%2Fwpia%2Fgigi%2Fpages%2Forga%2FTestOrgSwitch.java;h=40aed5f4055b77990018ee93b865cd69aa253e36;hp=94586e3452de2558126cf0113ba42a2b41264338;hb=13a45cb32dc366dfba718199e968f9b5c1d2001e;hpb=ea24bc217aacd2f5811288286d251866e498712b diff --git a/tests/club/wpia/gigi/pages/orga/TestOrgSwitch.java b/tests/club/wpia/gigi/pages/orga/TestOrgSwitch.java index 94586e34..40aed5f4 100644 --- a/tests/club/wpia/gigi/pages/orga/TestOrgSwitch.java +++ b/tests/club/wpia/gigi/pages/orga/TestOrgSwitch.java @@ -35,7 +35,7 @@ public class TestOrgSwitch extends OrgTest { assertNull(executeBasicWebInteraction(cookie, ViewOrgPage.DEFAULT_PATH + "/" + org2.getId(), "email=" + URLEncoder.encode(u2.getEmail(), "UTF-8") + "&do_affiliate=y&master=y", 1)); // login with new user u2 - cookie = login(email, TEST_PASSWORD); + cookie = cookieWithCertificateLogin(u2); } @After @@ -49,7 +49,7 @@ public class TestOrgSwitch extends OrgTest { assertNull(executeBasicWebInteraction(cookie, SwitchOrganisation.PATH, "org:" + org1.getId() + "=y", 0)); String res = IOUtils.readURL(get(SwitchOrganisation.PATH)); - assertThat(res, containsString("Logged in as " + org1.getName() + " (on behalf of " + u2.getPreferredName())); + assertThat(res, containsString("Logged in as " + u2.getPreferredName() + ", acting as " + org1.getName())); } @@ -83,7 +83,7 @@ public class TestOrgSwitch extends OrgTest { assertNull(executeBasicWebInteraction(cookie, SwitchOrganisation.PATH, "org:" + org2.getId() + "=y", 0)); String res = IOUtils.readURL(get(SwitchOrganisation.PATH)); - assertThat(res, containsString("Logged in as " + org2.getName() + " (on behalf of " + u2.getPreferredName())); + assertThat(res, containsString("Logged in as " + u2.getPreferredName() + ", acting as " + org2.getName())); } @@ -94,7 +94,7 @@ public class TestOrgSwitch extends OrgTest { assertNull(executeBasicWebInteraction(cookie, SwitchOrganisation.PATH, "org:" + org1.getId() + "=y", 0)); String res = IOUtils.readURL(get(SwitchOrganisation.PATH)); - assertThat(res, containsString("Logged in as " + org1.getName() + " (on behalf of " + u2.getPreferredName())); + assertThat(res, containsString("Logged in as " + u2.getPreferredName() + ", acting as " + org1.getName())); }