Issue 5827 - Assign new groups even if prior groups are present

sitescripts/notifications/test/notification.py

 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-present eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ skipping 332 matching lines @@
     def test_stays_in_group_when_notification_inactive(self):
         self.load_notifications_mock.return_value = [
             {'id': 'a', 'inactive': True}
         ]
         result = json.loads(notification.notification({
             'QUERY_STRING': 'lastVersion=197001010000-a/0-b/1'
         }, lambda *args: None))
         self.assertEqual(len(result['notifications']), 0)
         self.assertRegexpMatches(result['version'], r'-a/0')
 
+    def test_stays_in_group_when_notification_inactive_assign_new_group(self):
+        # See: https://issues.adblockplus.org/ticket/5827
+        self.load_notifications_mock.return_value = [
+            {'id': '1', 'inactive': True},
+            {'id': '2', 'variants': [
+                {'sample': 1, 'title': {'en-US': '2.1'}, 'message': {'en-US': '2.1'}},
+            ]},
+        ]
+        result = json.loads(notification.notification({
+            'QUERY_STRING': 'lastVersion=197001010000-1/0'
+        }, lambda *args: None))
+        self.assertEqual(len(result['notifications']), 1)
+        self.assertRegexpMatches(result['version'], r'-1/0-2/1')
+
     def test_inactive_notifications_not_returned(self):
         self.load_notifications_mock.return_value = [
             {'id': 'a', 'title': {'en-US': ''}, 'message': {'en-US': ''}, 'inactive': True},
             {'id': 'b', 'title': {'en-US': ''}, 'message': {'en-US': ''}, 'inactive': False},
             {'id': 'c', 'title': {'en-US': ''}, 'message': {'en-US': ''}}
         ]
         result = json.loads(notification.notification({}, lambda *args: None))
         self.assertEqual(len(result['notifications']), 2)
         self.assertEqual(result['notifications'][0]['id'], 'b')
         self.assertEqual(result['notifications'][1]['id'], 'c')
 
     def test_inactive_notification_variant_not_returned(self):
         self.load_notifications_mock.return_value = [
             {'id': 'a', 'inactive': True}
         ]
         result = json.loads(notification.notification({
             'QUERY_STRING': 'lastVersion=197001010000-a/1'
         }, lambda *args: None))
         self.assertEqual(len(result['notifications']), 0)
 
 
 if __name__ == '__main__':
     unittest.main()