Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Bill Burke 2016-01-04 17:14:19 -05:00
commit 3f62cee836

View file

@ -82,7 +82,6 @@ public class LdapUserFederationTest extends AbstractConsoleTest {
} }
@Test @Test
@Ignore
public void invalidSettingsTest() { public void invalidSettingsTest() {
createLdapUserProvider.navigateTo(); createLdapUserProvider.navigateTo();
createLdapUserProvider.form().selectVendor(ACTIVE_DIRECTORY); createLdapUserProvider.form().selectVendor(ACTIVE_DIRECTORY);