💚 📝 Don't send email from Circle

The Circle environment is failing to send emails, so for now, dropping that functionality from the tests. :rewind: Revert ":green_heart: Remove email from test user" This reverts commit ad6d66e.
ChildMindInstitute · Dec 9, 2019 · adc207b · adc207b
1 parent ad6d66e
commit adc207b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/girderformindlogger/models/applet.py b/girderformindlogger/models/applet.py
@@ -147,7 +147,8 @@ def createAppletFromUrl(
         protocolUrl,
         user=None,
         roles=None,
-        constraints=None
+        constraints=None,
+        sendEmail=True
     ):
         from girderformindlogger.models.protocol import Protocol
         # get a protocol from a URL
@@ -186,7 +187,7 @@ def createAppletFromUrl(
                 str(applet.get('applet', applet).get('_id')
             )
         )
-        if 'email' in user:
+        if sendEmail and 'email' in user:
             from girderformindlogger.utility.mail_utils import sendMail
             sendMail(
                 subject=name,

diff --git a/test/testLib.py b/test/testLib.py
@@ -48,19 +48,19 @@ def testCreateUser(email=None, admin=False):
     displayName = 'test'
     # NOTE: girder makes login and email lowercase!!!
     login = 'testuser{}'.format(randomUser)
-    # if not email:
-        # email = 'testemail{}@testemail.com'.format(randomUser)
+    if not email:
+        email = 'testemail{}@testemail.com'.format(randomUser)
     password = 'password'
     createUser = UserModel().createUser(
         login=login,
         password=password,
         displayName=displayName,
-        # email=email
+        email=email
+    )
+    assert createUser['email'] == email, 'email does not match, {} {}'.format(
+        createUser['email'],
+        email
     )
-    # assert createUser['email'] == email, 'email does not match, {} {}'.format(
-        # createUser['email'],
-        # email
-    # )
     assert createUser['displayName'] == displayName, 'displayName does not match'
     assert createUser['login'] == login, 'login does not match, {} {}'.format(
         createUser['login'],
@@ -167,7 +167,8 @@ def addApplet(new_user, protocolUrl):
     ar = AppletModel().createAppletFromUrl(
         name="testProtocol{}".format(randomAS),
         protocolUrl=protocolUrl,
-        user=currentUser
+        user=currentUser,
+        sendEmail=False
     )
 
     while len(userApplets)==len(userAppletsToStart):
@@ -872,11 +873,11 @@ def step01():
             # First user will be admin on a new image
             admin = testCreateUser(admin=True)
         user = testCreateUser()
-        # with pytest.raises(AccessException) as excinfo:
-        #     authenticateWithEmailAddress(
-        #         user.get('email', 'test@mindlogger.org')
-        #     )
-        # assert "your username rather than your email" in str(excinfo.value)
+        with pytest.raises(AccessException) as excinfo:
+            authenticateWithEmailAddress(
+                user.get('email', 'test@mindlogger.org')
+            )
+        assert "your username rather than your email" in str(excinfo.value)
         currentUser = authenticate(user)
         return user