Clean up tests

Author: Ostap-Zherebetskyi

api_tests/subscriptions/views/test_subscriptions_list.py

@@ -34,11 +34,10 @@ def url(self, user, node):
     def test_list_complete(self, app, user, provider, node, global_user_notification, url):
         res = app.get(url, auth=user.auth)
         notification_ids = [item['id'] for item in res.json['data']]
-        # There should only be 4 notifications: users' global, node's comments, node's file updates and provider's preprint added.
+        # There should only be 3 notifications: users' global, node's file updates and provider's preprint added.
         assert len(notification_ids) == 3
         assert f'{user._id}_global' in notification_ids
         assert f'{provider._id}_new_pending_submissions' in notification_ids
-        assert f'{node._id}_comments' in notification_ids
         assert f'{node._id}_file_updated' in notification_ids
 
     def test_unauthenticated(self, app, url):

tests/test_notifications.py

@@ -429,26 +429,6 @@ def test_from_subscription_key(self):
             'event': 'comment_replies'
         }
 
-    def test_get_all_user_subscriptions(self):
-        user_subscriptions = list(utils.get_all_user_subscriptions(self.user))
-        assert self.project_subscription in user_subscriptions
-        assert self.node_comments_subscription in user_subscriptions
-        for x in self.user_subscription:
-            assert x in user_subscriptions
-        assert len(user_subscriptions) == 6
-
-    def test_get_all_node_subscriptions_given_user_subscriptions(self):
-        user_subscriptions = utils.get_all_user_subscriptions(self.user)
-        node_subscription_ids = [x._id for x in utils.get_all_node_subscriptions(self.user, self.node,
-                                                                          user_subscriptions=user_subscriptions)]
-        expected_node_subscription_ids = [x._id for x in self.node_subscription]
-        assert node_subscription_ids == expected_node_subscription_ids
-
-    def test_get_all_node_subscriptions_given_user_and_node(self):
-        node_subscription_ids = [x._id for x in utils.get_all_node_subscriptions(self.user, self.node)]
-        expected_node_subscription_ids = [x._id for x in self.node_subscription]
-        assert node_subscription_ids == expected_node_subscription_ids
-
     def test_get_configured_project_ids_does_not_return_user_or_node_ids(self):
         configured_nodes = utils.get_configured_projects(self.user)
         configured_ids = [n._id for n in configured_nodes]
@@ -498,171 +478,6 @@ def test_get_configured_project_ids_excludes_private_projects_if_no_subscription
         configured_project_nodes = utils.get_configured_projects(user)
         assert private_project not in configured_project_nodes
 
-    def test_get_parent_notification_type(self):
-        nt = utils.get_parent_notification_type(self.node, 'comments', self.user)
-        assert nt == 'email_transactional'
-
-    def test_get_parent_notification_type_no_parent_subscriptions(self):
-        node = factories.NodeFactory()
-        nt = utils.get_parent_notification_type(node._id, 'comments', self.user)
-        assert nt is None
-
-    def test_get_parent_notification_type_no_parent(self):
-        project = factories.ProjectFactory()
-        nt = utils.get_parent_notification_type(project._id, 'comments', self.user)
-        assert nt is None
-
-    def test_get_parent_notification_type_handles_user_id(self):
-        nt = utils.get_parent_notification_type(self.user._id, 'comments', self.user)
-        assert nt is None
-
-    def test_format_data_project_settings(self):
-        data = utils.format_data(self.user, [self.project])
-        parent_event = {
-            'event': {
-                'title': 'comments',
-                'description': constants.NODE_SUBSCRIPTIONS_AVAILABLE['comments'],
-                'notificationType': 'email_transactional',
-                'parent_notification_type': None
-            },
-            'kind': 'event',
-            'children': []
-        }
-        child_event = {
-            'event': {
-                'title': 'comments',
-                'description': constants.NODE_SUBSCRIPTIONS_AVAILABLE['comments'],
-                'notificationType': 'email_transactional',
-                'parent_notification_type': 'email_transactional'
-            },
-            'kind': 'event',
-            'children': []
-        }
-        expected_new = [['event'], 'event']
-        schema = subscription_schema(self.project, expected_new)
-        assert schema.validate(data)
-        assert has(data, parent_event)
-        assert has(data, child_event)
-
-    def test_format_data_node_settings(self):
-        data = utils.format_data(self.user, [self.node])
-        event = {
-            'event': {
-                'title': 'comments',
-                'description': constants.NODE_SUBSCRIPTIONS_AVAILABLE['comments'],
-                'notificationType': 'email_transactional',
-                'parent_notification_type': 'email_transactional'
-            },
-            'kind': 'event',
-            'children': []
-        }
-        schema = subscription_schema(self.project, ['event'])
-        assert schema.validate(data)
-        assert has(data, event)
-
-    def test_format_includes_admin_view_only_component_subscriptions(self):
-        # Test private components in which parent project admins are not contributors still appear in their
-        # notifications settings.
-        node = factories.NodeFactory(parent=self.project)
-        data = utils.format_data(self.user, [self.project])
-        event = {
-            'event': {
-                'title': 'comments',
-                'description': constants.NODE_SUBSCRIPTIONS_AVAILABLE['comments'],
-                'notificationType': 'adopt_parent',
-                'parent_notification_type': 'email_transactional'
-            },
-            'kind': 'event',
-            'children': [],
-        }
-        schema = subscription_schema(self.project, ['event', ['event'], ['event']])
-        assert schema.validate(data)
-        assert has(data, event)
-
-    def test_format_data_excludes_pointers(self):
-        project = factories.ProjectFactory()
-        pointed = factories.ProjectFactory()
-        project.add_pointer(pointed, Auth(project.creator))
-        project.creator.notifications_configured[project._id] = True
-        project.creator.save()
-        configured_project_nodes = utils.get_configured_projects(project.creator)
-        data = utils.format_data(project.creator, configured_project_nodes)
-        event = {
-            'event': {
-                'title': 'comments',
-                'description': constants.NODE_SUBSCRIPTIONS_AVAILABLE['comments'],
-                'notificationType': 'email_transactional',
-                'parent_notification_type': None
-            },
-            'kind': 'event',
-            'children': [],
-        }
-        schema = subscription_schema(self.project, ['event'])
-        assert schema.validate(data)
-        assert has(data, event)
-
-    def test_format_data_user_subscriptions_includes_private_parent_if_configured_children(self):
-        private_project = factories.ProjectFactory()
-        node = factories.NodeFactory(parent=private_project)
-
-        node_comments_subscription = factories.NotificationSubscriptionFactory(
-            _id=node._id + '_' + 'comments',
-            node=node,
-            event_name='comments'
-        )
-        node_comments_subscription.save()
-        node_comments_subscription.email_transactional.add(node.creator)
-        node_comments_subscription.save()
-
-        node.creator.notifications_configured[node._id] = True
-        node.creator.save()
-        configured_project_nodes = utils.get_configured_projects(node.creator)
-        data = utils.format_data(node.creator, configured_project_nodes)
-        event = {
-            'event': {
-                'title': 'comments',
-                'description': constants.NODE_SUBSCRIPTIONS_AVAILABLE['comments'],
-                'notificationType': 'email_transactional',
-                'parent_notification_type': None
-            },
-            'kind': 'event',
-            'children': [],
-        }
-        schema = subscription_schema(self.project, ['event', ['event']])
-        assert schema.validate(data)
-        assert has(data, event)
-
-    def test_format_data_user_subscriptions_if_children_points_to_parent(self):
-        private_project = factories.ProjectFactory(creator=self.user)
-        node = factories.NodeFactory(parent=private_project, creator=self.user)
-        node.save()
-        node_comments_subscription = factories.NotificationSubscriptionFactory(
-            _id=node._id + '_' + 'comments',
-            node=node,
-            event_name='comments'
-        )
-        node_comments_subscription.save()
-        node_comments_subscription.email_transactional.add(node.creator)
-        node_comments_subscription.save()
-
-        node.creator.notifications_configured[node._id] = True
-        node.creator.save()
-        configured_project_nodes = utils.get_configured_projects(node.creator)
-        data = utils.format_data(node.creator, configured_project_nodes)
-        event = {
-            'event': {
-                'title': 'comments',
-                'description': constants.NODE_SUBSCRIPTIONS_AVAILABLE['comments'],
-                'notificationType': 'email_transactional',
-                'parent_notification_type': None
-            },
-            'kind': 'event',
-            'children': [],
-        }
-        schema = subscription_schema(self.project, ['event', ['event']])
-        assert schema.validate(data)
-        assert has(data, event)
-
     def test_format_user_subscriptions(self):
         data = utils.format_user_subscriptions(self.user)
         expected = [
@@ -689,21 +504,6 @@ def test_format_user_subscriptions(self):
 
         assert data == expected
 
-    def test_get_global_notification_type(self):
-        notification_type = utils.get_global_notification_type(self.user_subscription[1] ,self.user)
-        assert 'email_transactional' == notification_type
-
-    # # Business logic prevents this from being an applicable unit test;
-    # # global_mentions cannot be unsubscribed from
-    # def test_check_if_all_global_subscriptions_are_none_true(self):
-    #     for x in self.user_subscription:
-    #         x.none.add(self.user)
-    #         x.email_transactional.remove(self.user)
-    #     for x in self.user_subscription:
-    #         x.save()
-    #     all_global_subscriptions_none = utils.check_if_all_global_subscriptions_are_none(self.user)
-    #     assert all_global_subscriptions_none
-
     def test_format_data_user_settings(self):
         data = utils.format_user_and_project_subscriptions(self.user)
         expected = [