Merge remote-tracking branch 'origin/tw/manage_cookie_data' into tw/manage_cookie_data

# Conflicts:
#	modules/data/about_prefs.components.json
#	tests/preferences/test_manage_cookie_data.py

Author: Tracy-Walker

modules/data/about_prefs.components.json

@@ -426,5 +426,23 @@
         "selectorData": "historyMode",
         "strategy": "id",
         "groups": []
+    },
+
+    "manage-cookies-site": {
+        "selectorData": "richlistitem[host='{name}']",
+        "strategy": "css",
+        "groups": []
+    },
+
+    "remove-selected-button": {
+        "selectorData": "removeSelected",
+        "strategy": "id",
+        "groups": []
+    },
+
+    "remove-all-button": {
+        "selectorData": "removeAll",
+        "strategy": "id",
+        "groups": []
     }
 }

tests/preferences/test_manage_cookie_data.py

@@ -1,10 +1,11 @@
+from time import sleep
+
 import pytest
+from pynput.keyboard import Controller, Key
 from selenium.webdriver import Firefox
 
 from modules.page_object import AboutPrefs
 from modules.util import BrowserActions
-from pynput.keyboard import Controller, Key
-from time import sleep
 
 COOKIE_SITE = "google.com"
 
@@ -79,4 +80,4 @@ def open_manage_cookies_data_dialog():
 
     # All the cookies and site data are deleted.
     cookie_list_post_remove = about_prefs.get_elements("cookies-manage-data-sitelist")
-    assert len(cookie_list_post_remove) == 1 # NOTE: always an empty item here
+    assert len(cookie_list_post_remove) == 1  # NOTE: always an empty item here