add impact Notification WIP

Author: Johnetordoff

osf/models/sanctions.py

@@ -398,6 +398,7 @@ def _rejection_url_context(self, user_id):
         return None
 
     def _send_approval_request_email(self, user, notification_type, context):
+        print(notification_type)
         NotificationType.objects.get(
             name=notification_type
         ).emit(

osf/notifications.yaml

@@ -234,6 +234,21 @@ notification_types:
     object_content_type_model_name: osfuser
     template: 'website/templates/emails/new_pending_submissions.html.mako'
     notification_freq_default: instantly
+  - name: user_invite_draft_registration
+    __docs__: ...
+    object_content_type_model_name: osfuser
+    template: 'website/templates/emails/new_pending_submissions.html.mako'
+    notification_freq_default: instantly
+  - name: user_invite_draft_registration
+    __docs__: ...
+    object_content_type_model_name: osfuser
+    template: 'website/templates/emails/new_pending_submissions.html.mako'
+    notification_freq_default: instantly
+  - name: user_invite_osf_preprint
+    __docs__: ...
+    object_content_type_model_name: osfuser
+    template: 'website/templates/emails/new_pending_submissions.html.mako'
+    notification_freq_default: instantly
 
   #### PROVIDER
   - name: new_pending_submissions
@@ -387,6 +402,16 @@ notification_types:
     object_content_type_model_name: abstractnode
     template: 'website/templates/emails/new_pending_submissions.html.mako'
     notification_freq_default: instantly
+  - name: node_pending_retraction_admin
+    __docs__: ...
+    object_content_type_model_name: abstractnode
+    template: 'website/templates/emails/new_pending_submissions.html.mako'
+    notification_freq_default: instantly
+  - name: node_pending_embargo_termination_admin
+    __docs__: ...
+    object_content_type_model_name: abstractnode
+    template: 'website/templates/emails/new_pending_submissions.html.mako'
+    notification_freq_default: instantly
   - name: wiki_updated
     __docs__: ...
     object_content_type_model_name: abstractnode

tests/test_registrations/test_retractions.py

@@ -22,8 +22,9 @@
     InvalidSanctionApprovalToken, InvalidSanctionRejectionToken,
     NodeStateError,
 )
-from osf.models import Contributor, Retraction
+from osf.models import Contributor, Retraction, NotificationType
 from osf.utils import permissions
+from tests.utils import capture_notifications
 
 
 @pytest.mark.enable_bookmark_creation
@@ -806,14 +807,16 @@ def test_POST_retraction_does_not_send_email_to_unregistered_admins(self):
             existing_user=unreg
         )
         self.registration.save()
-        self.app.post(
-            self.retraction_post_url,
-            json={'justification': ''},
-            auth=self.user.auth,
-        )
+        with capture_notifications() as notifications:
+            self.app.post(
+                self.retraction_post_url,
+                json={'justification': ''},
+                auth=self.user.auth,
+            )
         # Only the creator gets an email; the unreg user does not get emailed
-        #assert mock_send_mail.call_count == 1
-        assert False, 'redp test'
+        assert len(notifications) == 1
+        assert notifications[0]['type'] == NotificationType.Type.NODE_PENDING_RETRACTION_ADMIN
+
 
     def test_POST_pending_embargo_returns_HTTPError_HTTPOK(self):
         self.registration.embargo_registration(
@@ -904,16 +907,16 @@ def test_valid_POST_retraction_when_pending_retraction_raises_400(self, mock_sen
         )
         assert res.status_code == 400
 
-    @mock.patch('website.mails.send_mail')
-    def test_valid_POST_calls_send_mail_with_username(self, mock_send):
-        self.app.post(
-            self.retraction_post_url,
-            json={'justification': ''},
-            auth=self.user.auth,
-        )
-        assert mock_send.called
-        args, kwargs = mock_send.call_args
-        assert self.user.username in args
+    def test_valid_POST_calls_send_mail_with_username(self):
+        with capture_notifications() as notifications:
+            self.app.post(
+                self.retraction_post_url,
+                json={'justification': ''},
+                auth=self.user.auth,
+            )
+        assert len(notifications) == 1
+        username = notifications[0]['kargs']['user'].username
+        assert self.user.username == username
 
     def test_non_contributor_GET_approval_returns_HTTPError_UNAUTHORIZED(self):
         non_contributor = AuthUserFactory()

tests/test_webtests.py

@@ -34,6 +34,7 @@
 from osf.utils import permissions
 from addons.wiki.models import WikiPage, WikiVersion
 from addons.wiki.tests.factories import WikiFactory, WikiVersionFactory
+from tests.utils import capture_notifications
 from website import language
 from website.util import web_url_for, api_url_for
 
@@ -736,10 +737,11 @@ def test_can_receive_resend_confirmation_email(self):
         res = self.app.get(self.get_url)
         form = res.get_form('resendForm')
         form['email'] = self.unconfirmed_user.unconfirmed_emails[0]
-        res = form.submit(self.app)
+        with capture_notifications() as notifications:
+            res = form.submit(self.app)
 
         # check email, request and response
-        assert mock_send_mail.called
+        assert notifications
         assert res.status_code == 200
         assert res.request.path == self.post_url
         assert_in_html('If there is an OSF account', res.text)
@@ -750,10 +752,11 @@ def test_cannot_receive_resend_confirmation_email_1(self):
         res = self.app.get(self.get_url)
         form = res.get_form('resendForm')
         form['email'] = self.confirmed_user.emails.first().address
-        res = form.submit(self.app)
+        with capture_notifications() as notifications:
+            res = form.submit(self.app)
 
         # check email, request and response
-        assert not mock_send_mail.called
+        assert not notifications
         assert res.status_code == 200
         assert res.request.path == self.post_url
         assert_in_html('has already been confirmed', res.text)
@@ -764,10 +767,11 @@ def test_cannot_receive_resend_confirmation_email_2(self):
         res = self.app.get(self.get_url)
         form = res.get_form('resendForm')
         form['email'] = '[email protected]'
-        res = form.submit(self.app)
+        with capture_notifications() as notifications:
+            res = form.submit(self.app)
 
         # check email, request and response
-        assert not mock_send_mail.called
+        assert not notifications
         assert res.status_code == 200
         assert res.request.path == self.post_url
         assert_in_html('If there is an OSF account', res.text)
@@ -933,10 +937,11 @@ def test_get_forgot_password(self):
     # test that user from disabled institution can receive reset password email
     def test_can_receive_reset_password_email(self):
         # submit email to institutional forgot-password page
-        res = self.app.post(self.post_url, data={'forgot_password-email': self.user.username})
+        with capture_notifications() as notifications:
+            res = self.app.post(self.post_url, data={'forgot_password-email': self.user.username})
 
         # check mail was sent
-        assert mock_send_mail.called
+        assert not notifications
         # check http 200 response
         assert res.status_code == 200
         # check request URL is /forgotpassword
@@ -952,10 +957,11 @@ def test_can_receive_reset_password_email(self):
     # test that non-existing user cannot receive reset password email
     def test_cannot_receive_reset_password_email(self):
         # load forgot password page and submit email
-        res = self.app.post(self.post_url, data={'forgot_password-email': 'fake' + self.user.username})
+        with capture_notifications() as notifications:
+            res = self.app.post(self.post_url, data={'forgot_password-email': 'fake' + self.user.username})
 
         # check mail was not sent
-        assert not mock_send_mail.called
+        assert not notifications
         # check http 200 response
         assert res.status_code == 200
         # check request URL is /forgotpassword-institution
@@ -973,10 +979,11 @@ def test_not_active_user_no_reset_password_email(self):
         self.user.deactivate_account()
         self.user.save()
 
-        res = self.app.post(self.post_url, data={'forgot_password-email': self.user.username})
+        with capture_notifications() as notifications:
+            res = self.app.post(self.post_url, data={'forgot_password-email': self.user.username})
 
         # check mail was not sent
-        assert not mock_send_mail.called
+        assert not notifications
         # check http 200 response
         assert res.status_code == 200
         # check request URL is /forgotpassword-institution
@@ -1002,83 +1009,6 @@ def test_cannot_reset_password_twice_quickly(self):
         assert_not_in_html('If there is an OSF account', res.text)
 
 
-@unittest.skip('Public projects/components are dynamically loaded now.')
-class TestAUserProfile(OsfTestCase):
-
-    def setUp(self):
-        OsfTestCase.setUp(self)
-
-        self.user = AuthUserFactory()
-        self.me = AuthUserFactory()
-        self.project = ProjectFactory(creator=self.me, is_public=True, title=fake.bs())
-        self.component = NodeFactory(creator=self.me, parent=self.project, is_public=True, title=fake.bs())
-
-    # regression test for https://github.com/CenterForOpenScience/osf.io/issues/2623
-    def test_has_public_projects_and_components(self):
-        # I go to my own profile
-        url = web_url_for('profile_view_id', uid=self.me._primary_key)
-        # I see the title of both my project and component
-        res = self.app.get(url, auth=self.me.auth)
-        assert_in_html(self.component.title, res)
-        assert_in_html(self.project.title, res)
-
-        # Another user can also see my public project and component
-        url = web_url_for('profile_view_id', uid=self.me._primary_key)
-        # I see the title of both my project and component
-        res = self.app.get(url, auth=self.user.auth)
-        assert_in_html(self.component.title, res)
-        assert_in_html(self.project.title, res)
-
-    def test_shows_projects_with_many_contributors(self):
-        # My project has many contributors
-        for _ in range(5):
-            user = UserFactory()
-            self.project.add_contributor(user, auth=Auth(self.project.creator), save=True)
-
-        # I go to my own profile
-        url = web_url_for('profile_view_id', uid=self.me._primary_key)
-        res = self.app.get(url, auth=self.me.auth)
-        # I see '3 more' as a link
-        assert '3 more' in res.text
-
-        res = res.click('3 more')
-        assert res.request.path == self.project.url
-
-    def test_has_no_public_projects_or_components_on_own_profile(self):
-        # User goes to their profile
-        url = web_url_for('profile_view_id', uid=self.user._id)
-        res = self.app.get(url, auth=self.user.auth)
-
-        # user has no public components/projects
-        assert 'You have no public projects' in res
-        assert 'You have no public components' in res
-
-    def test_user_no_public_projects_or_components(self):
-        # I go to other user's profile
-        url = web_url_for('profile_view_id', uid=self.user._id)
-        # User has no public components/projects
-        res = self.app.get(url, auth=self.me.auth)
-        assert 'This user has no public projects' in res
-        assert 'This user has no public components'in res
-
-    # regression test
-    def test_does_not_show_registrations(self):
-        project = ProjectFactory(creator=self.user)
-        component = NodeFactory(parent=project, creator=self.user, is_public=False)
-        # User has a registration with public components
-        reg = RegistrationFactory(project=component.parent_node, creator=self.user, is_public=True)
-        for each in reg.nodes:
-            each.is_public = True
-            each.save()
-        # I go to other user's profile
-        url = web_url_for('profile_view_id', uid=self.user._id)
-        # Registration does not appear on profile
-        res = self.app.get(url, auth=self.me.auth)
-        assert 'This user has no public components' in res
-        assert reg.title not in res
-        assert reg.nodes[0].title not in res
-
-
 @pytest.mark.enable_bookmark_creation
 class TestPreprintBannerView(OsfTestCase):
     def setUp(self):