Merge ~ines-almeida/launchpad:fix-webhook-unittests into launchpad:master

[Ines Almeida]

Update failing unit tests

This fixes some unit tests that failed after merging a previous MP.

Failing tests: http://lpbuildbot.canonical.com/builders/lp-devel-xenial/builds/3796/steps/shell/logs/summary

[Colin Watson (cjwatson)]

review: Approve

diff --git a/lib/lp/registry/stories/webservice/xx-distribution-source-package.rst b/lib/lp/registry/stories/webservice/xx-distribution-source-package.rst
index 1ec01b3..a848237 100644
--- a/lib/lp/registry/stories/webservice/xx-distribution-source-package.rst
+++ b/lib/lp/registry/stories/webservice/xx-distribution-source-package.rst
@@ -23,6 +23,7 @@ Source packages can be obtained from the context of a distribution.
     title: 'mozilla-firefox package in Debian'
     upstream_product_link: None
     web_link: 'http://launchpad.../debian/+source/mozilla-firefox'
+    webhooks_collection_link: 'http.../debian/+source/mozilla-firefox/webhooks'
 
 It's also possible to search for tasks with the "searchTasks" method:
 
diff --git a/lib/lp/registry/stories/webservice/xx-distribution.rst b/lib/lp/registry/stories/webservice/xx-distribution.rst
index de764b4..1d9a8e9 100644
--- a/lib/lp/registry/stories/webservice/xx-distribution.rst
+++ b/lib/lp/registry/stories/webservice/xx-distribution.rst
@@ -73,6 +73,7 @@ And for every distribution we publish most of its attributes.
     vcs: None
     vulnerabilities_collection_link: 'http://.../ubuntu/vulnerabilities'
     web_link: 'http://launchpad.../ubuntu'
+    webhooks_collection_link: 'http://api.launchpad.../ubuntu/webhooks'
 
 
 Distribution Custom Operations
diff --git a/lib/lp/registry/stories/webservice/xx-project-registry.rst b/lib/lp/registry/stories/webservice/xx-project-registry.rst
index 796f357..37b1061 100644
--- a/lib/lp/registry/stories/webservice/xx-project-registry.rst
+++ b/lib/lp/registry/stories/webservice/xx-project-registry.rst
@@ -221,6 +221,7 @@ Projects are available at their canonical URL on the API virtual host.
     translation_focus_link: None
     vcs: None
     web_link: 'http://launchpad.../firefox'
+    webhooks_collection_link: 'http://api.launchpad.../firefox/webhooks'
     wiki_url: None
 
 In Launchpad project names may not have uppercase letters in their
diff --git a/lib/lp/registry/tests/test_product.py b/lib/lp/registry/tests/test_product.py
index 82cf161..8738a3e 100644
--- a/lib/lp/registry/tests/test_product.py
+++ b/lib/lp/registry/tests/test_product.py
@@ -1113,11 +1113,15 @@ class TestProduct(TestCaseWithFactory):
         "launchpad.Driver": {"newSeries"},
         "launchpad.Edit": {
             "addOfficialBugTag",
+            "checkInformationType",
+            "default_webhook_event_types",
+            "newWebhook",
             "removeOfficialBugTag",
             "setBranchSharingPolicy",
             "setBugSharingPolicy",
             "setSpecificationSharingPolicy",
-            "checkInformationType",
+            "valid_webhook_event_types",
+            "webhooks",
         },
         "launchpad.Moderate": {
             "is_permitted",
diff --git a/lib/lp/services/webhooks/tests/test_browser.py b/lib/lp/services/webhooks/tests/test_browser.py
index 7542cae..4392228 100644
--- a/lib/lp/services/webhooks/tests/test_browser.py
+++ b/lib/lp/services/webhooks/tests/test_browser.py
@@ -182,7 +182,7 @@ class BugUpdateTestHelpersBase:
 
     event_type = "bug:0.1"
     expected_event_types = [
-        ("bug:0.1", "Bug change"),
+        ("bug:0.1", "Bug creation/change"),
         ("bug:comment:0.1", "Bug comment"),
     ]