You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2019/05/21 15:40:04 UTC

[allura] 07/09: [#8286] upgrade to TG 2.3.6

This is an automated email from the ASF dual-hosted git repository.

brondsem pushed a commit to branch db/8286
in repository https://gitbox.apache.org/repos/asf/allura.git

commit b8621d404aa4b1b1baa4d141ae7478a20c776474
Author: Dave Brondsema <da...@brondsema.net>
AuthorDate: Mon May 20 15:05:59 2019 -0400

    [#8286] upgrade to TG 2.3.6
---
 Allura/allura/templates/webhooks/create_form.html |  1 +
 Allura/allura/tests/test_webhooks.py              | 13 ++++++++++++-
 requirements.txt                                  |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Allura/allura/templates/webhooks/create_form.html b/Allura/allura/templates/webhooks/create_form.html
index 95bfdf6..878b4f7 100644
--- a/Allura/allura/templates/webhooks/create_form.html
+++ b/Allura/allura/templates/webhooks/create_form.html
@@ -65,6 +65,7 @@
 
 {% block content %}
 {{ error('_the_form') }}
+{{ error('webhook') }}
 <form action="{{action}}" method="post" enctype="multipart/form-data">
   <div>
     <label for="url">url</label>
diff --git a/Allura/allura/tests/test_webhooks.py b/Allura/allura/tests/test_webhooks.py
index 795ca1c..497dad8 100644
--- a/Allura/allura/tests/test_webhooks.py
+++ b/Allura/allura/tests/test_webhooks.py
@@ -251,7 +251,18 @@ class TestWebhookController(TestController):
         self.find_error(r, 'url',
                         'You must provide a full domain name (like qwer.com)')
 
-    def test_edit(self):
+    def test_AAAA_WORKAROUND__edit(self):
+        """
+        This must run first in this test class for unknown reasons ever since
+            https://github.com/TurboGears/tg2/commit/02fb49b14e70fdd8ac16973488fb3637e5e59114
+
+        If any test runs the self.app.post from create_webhook before this one, then this test will fail on:
+            with td.audits(msg):
+                r = form.submit()
+        because WebhookValidator's `value` will be "create" instead of an objectid str
+
+        Maybe something to do with WebhookControllerMeta setup of `validate` decorators?
+        """
         data1 = {'url': u'http://httpbin.org/post',
                  'secret': u'secret'}
         data2 = {'url': u'http://example.com/hook',
diff --git a/requirements.txt b/requirements.txt
index 557799d..e38a916 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -49,7 +49,7 @@ textile==2.1.5
 # dep of colander
 translationstring==1.3
 TimerMiddleware==0.4.4
-TurboGears2==2.3.4
+TurboGears2==2.3.6
 # dep of html5lib
 webencodings==0.5.1
 WebOb==1.7.4