[#144] Fixes tests broken in 1.15 merge.

myhpom · Apr 27, 2018 · a4b4586 · a4b4586
1 parent dfc48e3
commit a4b4586
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/hs_core/hydroshare/utils.py b/hs_core/hydroshare/utils.py
@@ -699,7 +699,8 @@ def validate_user_quota(user, size):
                 if used_percent >= hard_limit or uq.remaining_grace_period == 0:
                     msg_template_str = '{}{}\n\n'.format(qmsg.enforce_content_prepend,
                                                          qmsg.content)
-                    msg_str = msg_template_str.format(used=rounded_used_val,
+                    msg_str = msg_template_str.format(email=user.email,
+                                                      used=rounded_used_val,
                                                       unit=uq.unit,
                                                       allocated=uq.allocated_value,
                                                       zone=uq.zone,

diff --git a/hs_core/tests/api/native/test_folder_download_zip.py b/hs_core/tests/api/native/test_folder_download_zip.py
@@ -14,7 +14,7 @@ class TestFolderDownloadZip(TestCase):
     def setUp(self):
         super(TestFolderDownloadZip, self).setUp()
         self.output_path = "zips/rand/foo.zip"
-        self.group, _ = Group.objects.get_or_create(name='Hydroshare Author')
+        self.group, _ = Group.objects.get_or_create(name='Resource Author')
         self.user = create_account(
             '[email protected]',
             username='shaun',

diff --git a/theme/tests/test_delimiter_migration.py b/theme/tests/test_delimiter_migration.py
@@ -46,7 +46,7 @@ class TestDelimiterMigration(TestMigrations):
     migrate_to = '0014_comma_semicolon_delimiter'
 
     def setUpBeforeMigration(self, apps):
-        self.group, _ = Group.objects.get_or_create(name='Hydroshare Author')
+        self.group, _ = Group.objects.get_or_create(name='Resource Author')
         user = hydroshare.create_account(
             '[email protected]',
             username='user1',