fix unit tests

Author: Ostap-Zherebetskyi

api_tests/mailhog/provider/test_schema_responses.py

@@ -205,13 +205,11 @@ def test_accept_notification_sent_on_admin_approval(self, revised_response, admi
         delete_mailhog_messages()
         with capture_notifications(passthrough=True) as notifications:
             revised_response.approve(user=admin_user)
-        assert len(notifications['emits']) == 3
+        assert len(notifications['emits']) == 2
         assert notifications['emits'][0]['kwargs']['user'] == moderator
         assert notifications['emits'][0]['type'] == NotificationType.Type.PROVIDER_NEW_PENDING_SUBMISSIONS
-        assert notifications['emits'][1]['kwargs']['user'] == moderator
-        assert notifications['emits'][1]['type'] == NotificationType.Type.PROVIDER_NEW_PENDING_SUBMISSIONS
-        assert notifications['emits'][2]['kwargs']['user'] == admin_user
-        assert notifications['emits'][2]['type'] == NotificationType.Type.NODE_SCHEMA_RESPONSE_APPROVED
+        assert notifications['emits'][1]['kwargs']['user'] == admin_user
+        assert notifications['emits'][1]['type'] == NotificationType.Type.NODE_SCHEMA_RESPONSE_APPROVED
         massages = get_mailhog_messages()
         assert massages['count'] == len(notifications['emails'])
         assert_emails(massages, notifications)
@@ -226,13 +224,11 @@ def test_moderators_notified_on_admin_approval(self, revised_response, admin_use
         delete_mailhog_messages()
         with capture_notifications(passthrough=True) as notifications:
             revised_response.approve(user=admin_user)
-        assert len(notifications['emits']) == 3
+        assert len(notifications['emits']) == 2
         assert notifications['emits'][0]['kwargs']['user'] == moderator
         assert notifications['emits'][0]['type'] == NotificationType.Type.PROVIDER_NEW_PENDING_SUBMISSIONS
-        assert notifications['emits'][1]['kwargs']['user'] == moderator
-        assert notifications['emits'][1]['type'] == NotificationType.Type.PROVIDER_NEW_PENDING_SUBMISSIONS
-        assert notifications['emits'][2]['kwargs']['user'] == admin_user
-        assert notifications['emits'][2]['type'] == NotificationType.Type.NODE_SCHEMA_RESPONSE_APPROVED
+        assert notifications['emits'][1]['kwargs']['user'] == admin_user
+        assert notifications['emits'][1]['type'] == NotificationType.Type.NODE_SCHEMA_RESPONSE_APPROVED
         massages = get_mailhog_messages()
         assert massages['count'] == len(notifications['emails'])
         assert_emails(massages, notifications)

api_tests/mailhog/provider/test_submissions.py

@@ -113,10 +113,9 @@ def test_get_provider_actions(self, app, provider_actions_url, registration, mod
 
             resp = app.get(provider_actions_url, auth=moderator.auth)
 
-        assert len(notifications['emits']) == 3
+        assert len(notifications['emits']) == 2
         assert notifications['emits'][0]['type'] == NotificationType.Type.PROVIDER_REVIEWS_SUBMISSION_CONFIRMATION
         assert notifications['emits'][1]['type'] == NotificationType.Type.PROVIDER_NEW_PENDING_SUBMISSIONS
-        assert notifications['emits'][2]['type'] == NotificationType.Type.PROVIDER_NEW_PENDING_SUBMISSIONS
         massages = get_mailhog_messages()
         assert massages['count'] == len(notifications['emails'])
         assert_emails(massages, notifications)

osf_tests/test_registration_moderation_notifications.py

@@ -134,13 +134,12 @@ def test_submit_notifications(self, registration, moderator, admin, contrib, pro
         with capture_notifications() as notification:
             notify_submit(registration, admin)
 
-        assert len(notification['emits']) == 4
+        assert len(notification['emits']) == 3
         assert notification['emits'][0]['type'] == NotificationType.Type.PROVIDER_REVIEWS_SUBMISSION_CONFIRMATION
         assert notification['emits'][0]['kwargs']['user'] == admin
         assert notification['emits'][1]['type'] == NotificationType.Type.PROVIDER_REVIEWS_SUBMISSION_CONFIRMATION
         assert notification['emits'][1]['kwargs']['user'] == contrib
         assert notification['emits'][2]['type'] == NotificationType.Type.PROVIDER_NEW_PENDING_SUBMISSIONS
-        assert notification['emits'][3]['type'] == NotificationType.Type.PROVIDER_NEW_PENDING_SUBMISSIONS
 
         assert NotificationSubscription.objects.count() == 5
         digest = NotificationSubscription.objects.last()

osf_tests/test_schema_responses.py

@@ -859,13 +859,11 @@ def test_accept_notification_sent_on_admin_approval(self, revised_response, admi
 
         with capture_notifications() as notifications:
             revised_response.approve(user=admin_user)
-        assert len(notifications['emits']) == 3
+        assert len(notifications['emits']) == 2
         assert notifications['emits'][0]['kwargs']['user'] == moderator
         assert notifications['emits'][0]['type'] == NotificationType.Type.PROVIDER_NEW_PENDING_SUBMISSIONS
-        assert notifications['emits'][1]['kwargs']['user'] == moderator
-        assert notifications['emits'][1]['type'] == NotificationType.Type.PROVIDER_NEW_PENDING_SUBMISSIONS
-        assert notifications['emits'][2]['kwargs']['user'] == admin_user
-        assert notifications['emits'][2]['type'] == NotificationType.Type.NODE_SCHEMA_RESPONSE_APPROVED
+        assert notifications['emits'][1]['kwargs']['user'] == admin_user
+        assert notifications['emits'][1]['type'] == NotificationType.Type.NODE_SCHEMA_RESPONSE_APPROVED
 
     def test_moderators_notified_on_admin_approval(self, revised_response, admin_user, moderator):
         revised_response.approvals_state_machine.set_state(ApprovalStates.UNAPPROVED)
@@ -874,13 +872,11 @@ def test_moderators_notified_on_admin_approval(self, revised_response, admin_use
 
         with capture_notifications() as notifications:
             revised_response.approve(user=admin_user)
-        assert len(notifications['emits']) == 3
+        assert len(notifications['emits']) == 2
         assert notifications['emits'][0]['kwargs']['user'] == moderator
         assert notifications['emits'][0]['type'] == NotificationType.Type.PROVIDER_NEW_PENDING_SUBMISSIONS
-        assert notifications['emits'][1]['kwargs']['user'] == moderator
-        assert notifications['emits'][1]['type'] == NotificationType.Type.PROVIDER_NEW_PENDING_SUBMISSIONS
-        assert notifications['emits'][2]['kwargs']['user'] == admin_user
-        assert notifications['emits'][2]['type'] == NotificationType.Type.NODE_SCHEMA_RESPONSE_APPROVED
+        assert notifications['emits'][1]['kwargs']['user'] == admin_user
+        assert notifications['emits'][1]['type'] == NotificationType.Type.NODE_SCHEMA_RESPONSE_APPROVED
 
     def test_no_moderator_notification_on_admin_approval_of_initial_response(
             self, initial_response, admin_user):