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
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()));
}
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()));
}
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()));
}