Bring back support for newer wtforms

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

tests/test_pagure_flask_ui_app.py

@@ -638,9 +638,15 @@ class PagureFlaskApptests(tests.Modeltests):
             output_text = output.get_data(as_text=True)
             self.assertIn(
                 '<title>foo\'s settings - Pagure</title>', output_text)
-            self.assertIn(
-                '<textarea class="form-control" id="ssh_key" name="ssh_key">'
-                '</textarea>', output_text)
+            if self.get_wtforms_version() >= (2, 2):
+                self.assertIn(
+                    '<textarea class="form-control" '
+                    'id="ssh_key" name="ssh_key" required></textarea>',
+                    output_text)
+            else:
+                 self.assertIn(
+                    '<textarea class="form-control" '
+                    'id="ssh_key" name="ssh_key"></textarea>', output_text)
 
             csrf_token = self.get_csrf(output=output)
 
@@ -684,9 +690,15 @@ class PagureFlaskApptests(tests.Modeltests):
             self.assertIn('Public ssh key updated', output_text)
             self.assertIn(
                 '<title>foo\'s settings - Pagure</title>', output_text)
-            self.assertIn(
-                '<textarea class="form-control" id="ssh_key" name="ssh_key">'
-                'ssh-rsa AAAA', output_text)
+            if self.get_wtforms_version() >= (2, 2):
+                self.assertIn(
+                    '<textarea class="form-control" '
+                    'id="ssh_key" name="ssh_key" required>ssh-rsa AAAA',
+                    output_text)
+            else:
+                 self.assertIn(
+                    '<textarea class="form-control" '
+                    'id="ssh_key" name="ssh_key">ssh-rsa AAAA', output_text)
 
             ast.return_value = True
             output = self.app.get('/settings/')
@@ -708,8 +720,8 @@ class PagureFlaskApptests(tests.Modeltests):
             self.assertIn(
                 '<title>foo\'s settings - Pagure</title>', output_text)
             self.assertNotIn(
-                '<textarea class="form-control" id="ssh_key" name="ssh_key">'
-                '</textarea>', output_text)
+                '<textarea class="form-control" id="ssh_key" name="ssh_key"',
+                output_text)
 
     @patch.dict('pagure.config.config', {'LOCAL_SSH_KEY': False})
     @patch('pagure.ui.app.admin_session_timedout')
@@ -727,8 +739,8 @@ class PagureFlaskApptests(tests.Modeltests):
             self.assertIn(
                 '<title>foo\'s settings - Pagure</title>', output_text)
             self.assertNotIn(
-                '<textarea class="form-control" id="ssh_key" name="ssh_key">'
-                '</textarea>', output_text)
+                '<textarea class="form-control" id="ssh_key" name="ssh_key"',
+                output_text)
 
             # Before
             user = pagure.lib.get_user(self.session, 'foo')
@@ -753,8 +765,8 @@ class PagureFlaskApptests(tests.Modeltests):
             self.assertIn(
                 '<title>foo\'s settings - Pagure</title>', output_text)
             self.assertNotIn(
-                '<textarea class="form-control" id="ssh_key" name="ssh_key">'
-                'ssh-rsa AAAA', output_text)
+                '<textarea class="form-control" id="ssh_key" name="ssh_key"',
+                output_text)
 
             # After
             user = pagure.lib.get_user(self.session, 'foo')
@@ -792,9 +804,15 @@ class PagureFlaskApptests(tests.Modeltests):
             output_text = output.get_data(as_text=True)
             self.assertIn(
                 '<title>foo\'s settings - Pagure</title>', output_text)
-            self.assertIn(
-                '<textarea class="form-control" id="ssh_key" name="ssh_key">'
-                '</textarea>', output_text)
+            if self.get_wtforms_version() >= (2, 2):
+                self.assertIn(
+                    '<textarea class="form-control" '
+                    'id="ssh_key" name="ssh_key" required></textarea>',
+                    output_text)
+            else:
+                 self.assertIn(
+                    '<textarea class="form-control" '
+                    'id="ssh_key" name="ssh_key"></textarea>', output_text)
 
             csrf_token = self.get_csrf(output=output)
 
@@ -1179,9 +1197,15 @@ class PagureFlaskApptests(tests.Modeltests):
             output_text = output.get_data(as_text=True)
             self.assertIn(
                 '<title>pingou\'s settings - Pagure</title>', output_text)
-            self.assertIn(
-                '<textarea class="form-control" id="ssh_key" name="ssh_key">'
-                '</textarea>', output_text)
+            if self.get_wtforms_version() >= (2, 2):
+                self.assertIn(
+                    '<textarea class="form-control" '
+                    'id="ssh_key" name="ssh_key" required></textarea>',
+                    output_text)
+            else:
+                 self.assertIn(
+                    '<textarea class="form-control" '
+                    'id="ssh_key" name="ssh_key"></textarea>', output_text)
 
             csrf_token = self.get_csrf(output=output)
 
@@ -1270,9 +1294,15 @@ class PagureFlaskApptests(tests.Modeltests):
             output_text = output.get_data(as_text=True)
             self.assertIn(
                 '<title>pingou\'s settings - Pagure</title>', output_text)
-            self.assertIn(
-                '<textarea class="form-control" id="ssh_key" name="ssh_key">'
-                '</textarea>', output_text)
+            if self.get_wtforms_version() >= (2, 2):
+                self.assertIn(
+                    '<textarea class="form-control" '
+                    'id="ssh_key" name="ssh_key" required></textarea>',
+                    output_text)
+            else:
+                 self.assertIn(
+                    '<textarea class="form-control" '
+                    'id="ssh_key" name="ssh_key"></textarea>', output_text)
 
             csrf_token = self.get_csrf(output=output)
 

tests/test_pagure_flask_ui_plugins_noff.py

@@ -42,9 +42,14 @@ class PagureFlaskPluginNoFFtests(tests.SimplePagureTest):
             self.assertIn(
                 '<title>Settings Block non fast-forward pushes - test - '
                 'Pagure</title>', output_text)
-            self.assertIn(
-                '<input class="form-control" id="branches" name="branches" '
-                'type="text" value=""></td>', output_text)
+            if self.get_wtforms_version() >= (2, 2):
+                self.assertIn(
+                    '<input class="form-control" id="branches" name="branches" '
+                    'required type="text" value=""></td>', output_text)
+            else:
+                self.assertIn(
+                    '<input class="form-control" id="branches" name="branches" '
+                    'type="text" value=""></td>', output_text)
             self.assertTrue(
                 '<input class="form-control" id="active" name="active" '
                 'type="checkbox" value="y">' in output_text)
@@ -61,9 +66,14 @@ class PagureFlaskPluginNoFFtests(tests.SimplePagureTest):
             self.assertIn(
                 '<title>Settings Block non fast-forward pushes - test - '
                 'Pagure</title>', output_text)
-            self.assertIn(
-                '<input class="form-control" id="branches" name="branches" '
-                'type="text" value="">', output_text)
+            if self.get_wtforms_version() >= (2, 2):
+                self.assertIn(
+                    '<input class="form-control" id="branches" name="branches" '
+                    'required type="text" value=""></td>', output_text)
+            else:
+                self.assertIn(
+                    '<input class="form-control" id="branches" name="branches" '
+                    'type="text" value=""></td>', output_text)
             self.assertTrue(
                 '<input class="form-control" id="active" name="active" '
                 'type="checkbox" value="y">' in output_text)
@@ -90,9 +100,14 @@ class PagureFlaskPluginNoFFtests(tests.SimplePagureTest):
             self.assertIn(
                 '<title>Settings Block non fast-forward pushes - test - '
                 'Pagure</title>', output_text)
-            self.assertIn(
-                '<input class="form-control" id="branches" name="branches" '
-                'type="text" value="">', output_text)
+            if self.get_wtforms_version() >= (2, 2):
+                self.assertIn(
+                    '<input class="form-control" id="branches" name="branches" '
+                    'required type="text" value=""></td>', output_text)
+            else:
+                self.assertIn(
+                    '<input class="form-control" id="branches" name="branches" '
+                    'type="text" value=""></td>', output_text)
             self.assertTrue(
                 '<input class="form-control" id="active" name="active" '
                 'type="checkbox" value="y">' in output_text)
@@ -155,9 +170,14 @@ class PagureFlaskPluginNoFFtests(tests.SimplePagureTest):
             self.assertIn(
                 '<title>Settings Block non fast-forward pushes - test - '
                 'Pagure</title>', output_text)
-            self.assertIn(
-                '<input class="form-control" id="branches" name="branches" '
-                'type="text" value="master">', output_text)
+            if self.get_wtforms_version() >= (2, 2):
+                self.assertIn(
+                    '<input class="form-control" id="branches" name="branches" '
+                    'required type="text" value="master"></td>', output_text)
+            else:
+                self.assertIn(
+                    '<input class="form-control" id="branches" name="branches" '
+                    'type="text" value="master"></td>', output_text)
             self.assertIn(
                 '<input checked class="form-control" id="active" name="active" '
                 'type="checkbox" value="y">', output_text)
@@ -186,9 +206,14 @@ class PagureFlaskPluginNoFFtests(tests.SimplePagureTest):
             self.assertIn(
                 '<title>Settings Block non fast-forward pushes - test - '
                 'Pagure</title>', output_text)
-            self.assertIn(
-                '<input class="form-control" id="branches" name="branches" '
-                'type="text" value="">', output_text)
+            if self.get_wtforms_version() >= (2, 2):
+                self.assertIn(
+                    '<input class="form-control" id="branches" name="branches" '
+                    'required type="text" value="">', output_text)
+            else:
+                self.assertIn(
+                    '<input class="form-control" id="branches" name="branches" '
+                    'type="text" value="">', output_text)
             self.assertIn(
                 '<input class="form-control" id="active" name="active" '
                 'type="checkbox" value="y">', output_text)

tests/test_pagure_flask_ui_repo.py

@@ -4494,9 +4494,14 @@ index 0000000..fb7093d
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
             self.assertIn('<h5 class="pl-2 font-weight-bold text-muted">Project Settings</h5>', output_text)
-            self.assertIn(
-                '<select class="c-select" id="branches" name="branches">'
-                '</select>', output_text)
+            if self.get_wtforms_version() >= (2, 2):
+                self.assertIn(
+                    '<select class="c-select" id="branches" name="branches" '
+                    'required></select>', output_text)
+            else:
+                self.assertIn(
+                    '<select class="c-select" id="branches" name="branches">'
+                    '</select>', output_text)
             csrf_token = output_text.split(
                 'name="csrf_token" type="hidden" value="')[1].split('">')[0]
 
@@ -4523,7 +4528,8 @@ index 0000000..fb7093d
                 'csrf_token': csrf_token,
             }
 
-            output = self.app.post('/test/default/branch/',     # changing head to feature branch
+            # changing head to feature branch
+            output = self.app.post('/test/default/branch/',
                                     data=data,
                                     follow_redirects=True)
             self.assertEqual(output.status_code, 200)
@@ -4531,11 +4537,19 @@ index 0000000..fb7093d
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
             self.assertIn('<h5 class="pl-2 font-weight-bold text-muted">Project Settings</h5>', output_text)
-            self.assertIn(
-                '<select class="c-select" id="branches" name="branches">'
-                '<option selected value="feature">feature</option>'
-                '<option value="master">master</option>'
-                '</select>', output_text)
+            if self.get_wtforms_version() >= (2, 2):
+                self.assertIn(
+                    '<select class="c-select" id="branches" name="branches" '
+                    'required>'
+                    '<option selected value="feature">feature</option>'
+                    '<option value="master">master</option>'
+                    '</select>', output_text)
+            else:
+                self.assertIn(
+                    '<select class="c-select" id="branches" name="branches">'
+                    '<option selected value="feature">feature</option>'
+                    '<option value="master">master</option>'
+                    '</select>', output_text)
             self.assertIn(
                 '</button>\n                      Default branch updated '
                 'to feature', output_text)
@@ -4545,7 +4559,8 @@ index 0000000..fb7093d
                 'csrf_token': csrf_token,
             }
 
-            output = self.app.post('/test/default/branch/',     # changing head to master branch
+            # changing head to master branch
+            output = self.app.post('/test/default/branch/',
                                     data=data,
                                     follow_redirects=True)
             self.assertEqual(output.status_code, 200)
@@ -4553,11 +4568,19 @@ index 0000000..fb7093d
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
             self.assertIn('<h5 class="pl-2 font-weight-bold text-muted">Project Settings</h5>', output_text)
-            self.assertIn(
-                '<select class="c-select" id="branches" name="branches">'
-                '<option value="feature">feature</option>'
-                '<option selected value="master">master</option>'
-                '</select>', output_text)
+            if self.get_wtforms_version() >= (2, 2):
+                self.assertIn(
+                    '<select class="c-select" id="branches" name="branches" '
+                    'required>'
+                    '<option value="feature">feature</option>'
+                    '<option selected value="master">master</option>'
+                    '</select>', output_text)
+            else:
+                self.assertIn(
+                    '<select class="c-select" id="branches" name="branches">'
+                    '<option value="feature">feature</option>'
+                    '<option selected value="master">master</option>'
+                    '</select>', output_text)
             self.assertIn(
                 '</button>\n                      Default branch updated '
                 'to master', output_text)