Repository: usergrid Updated Branches: refs/heads/master 4610eed26 -> 586dad080
USERGRID-1200: EmailFlowIT fix Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/586dad08 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/586dad08 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/586dad08 Branch: refs/heads/master Commit: 586dad08091ed19e532695f234a0d973176ad3b6 Parents: 4610eed Author: Mike Dunker <mdun...@apigee.com> Authored: Mon Jan 25 17:23:58 2016 -0800 Committer: Mike Dunker <mdun...@apigee.com> Committed: Mon Jan 25 17:23:58 2016 -0800 ---------------------------------------------------------------------- .../test/java/org/apache/usergrid/management/EmailFlowIT.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/586dad08/stack/services/src/test/java/org/apache/usergrid/management/EmailFlowIT.java ---------------------------------------------------------------------- diff --git a/stack/services/src/test/java/org/apache/usergrid/management/EmailFlowIT.java b/stack/services/src/test/java/org/apache/usergrid/management/EmailFlowIT.java index e9c0bd8..a46bd60 100644 --- a/stack/services/src/test/java/org/apache/usergrid/management/EmailFlowIT.java +++ b/stack/services/src/test/java/org/apache/usergrid/management/EmailFlowIT.java @@ -78,7 +78,6 @@ public class EmailFlowIT { setup.set( PROPERTIES_SYSADMIN_APPROVES_ADMIN_USERS, "false" ); setup.set( PROPERTIES_SYSADMIN_APPROVES_ORGANIZATIONS, "false" ); setup.set( PROPERTIES_ADMIN_USERS_REQUIRE_CONFIRMATION, "true" ); - setup.set( PROPERTIES_DEFAULT_SYSADMIN_EMAIL, "sysadmi...@mockserver.com" ); setup.set( PROPERTIES_NOTIFY_ADMIN_OF_ACTIVATION, "true" ); final String orgName = uniqueOrg(); @@ -121,7 +120,6 @@ public class EmailFlowIT { setup.set( PROPERTIES_NOTIFY_ADMIN_OF_ACTIVATION, "true" ); setup.set( PROPERTIES_SYSADMIN_APPROVES_ORGANIZATIONS, "false" ); setup.set( PROPERTIES_ADMIN_USERS_REQUIRE_CONFIRMATION, "true" ); - setup.set( PROPERTIES_DEFAULT_SYSADMIN_EMAIL, "sysadmi...@mockserver.com" ); final String orgName = uniqueOrg(); final String userName = uniqueUsername(); @@ -156,7 +154,7 @@ public class EmailFlowIT { assertEquals( "User Account Confirmed", confirmation.getSubject() ); - List<Message> sysadmin_inbox = Mailbox.get( "sysadmi...@mockserver.com" ); + List<Message> sysadmin_inbox = Mailbox.get( "testad...@usergrid.com" ); assertFalse( sysadmin_inbox.isEmpty() ); Message activation = sysadmin_inbox.get( 0 );
