usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [03/50] [abbrv] usergrid git commit: USERGRID-1200: EmailFlowIT fix
Date Thu, 04 Feb 2016 17:57:27 GMT
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/asf-site
Commit: 586dad08091ed19e532695f234a0d973176ad3b6
Parents: 4610eed
Author: Mike Dunker <mdunker@apigee.com>
Authored: Mon Jan 25 17:23:58 2016 -0800
Committer: Mike Dunker <mdunker@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, "sysadmin-1@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, "sysadmin-2@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( "sysadmin-2@mockserver.com" );
+        List<Message> sysadmin_inbox = Mailbox.get( "testadmin@usergrid.com" );
         assertFalse( sysadmin_inbox.isEmpty() );
 
         Message activation = sysadmin_inbox.get( 0 );


Mime
View raw message