From 1e4803f3ff27c78993eea912105b66557b996a63 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Apr 24 2015 12:12:11 +0000
Subject: Adjust the unit-tests suite to reflect the changes in how we update plugin settings


---

diff --git a/tests/test_progit_flask_ui_plugins.py b/tests/test_progit_flask_ui_plugins.py
index ae0ecd3..046a093 100644
--- a/tests/test_progit_flask_ui_plugins.py
+++ b/tests/test_progit_flask_ui_plugins.py
@@ -108,24 +108,28 @@ class PagureFlaskPluginstests(tests.Modeltests):
                 'csrf_token': csrf_token,
             }
 
-            output = self.app.post('/test/settings/Mail', data=data)
+            output = self.app.post(
+                '/test/settings/Mail', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<section class="settings">\n  <h3>Mail</h3>', output.data)
+                '<section class="settings">\n  <h2>Settings</h2>',
+                output.data)
             self.assertIn(
-                '<li class="message">Hook activated</li>', output.data)
+                '<li class="message">Hook Mail activated</li>', output.data)
 
             data = {
                 'mail_to': '',
                 'csrf_token': csrf_token,
             }
 
-            output = self.app.post('/test/settings/Mail', data=data)
+            output = self.app.post(
+                '/test/settings/Mail', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<section class="settings">\n  <h3>Mail</h3>', output.data)
+                '<section class="settings">\n  <h2>Settings</h2>',
+                output.data)
             self.assertIn(
-                '<li class="message">Hook inactived</li>', output.data)
+                '<li class="message">Hook Mail inactived</li>', output.data)
 
     def test_RequiredIf(self):
         """ Test the behavior of the RequiredIf validator. """
diff --git a/tests/test_progit_flask_ui_plugins_fedmsg.py b/tests/test_progit_flask_ui_plugins_fedmsg.py
index 72e05a1..02b7a58 100644
--- a/tests/test_progit_flask_ui_plugins_fedmsg.py
+++ b/tests/test_progit_flask_ui_plugins_fedmsg.py
@@ -88,15 +88,19 @@ class PagureFlaskPluginFedmsgtests(tests.Modeltests):
             tests.create_projects_git(tests.HERE)
 
             # With the git repo
-            output = self.app.post('/test/settings/Fedmsg', data=data)
+            output = self.app.post(
+                '/test/settings/Fedmsg', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
+            self.assertTrue('<h2>Settings</h2>' in output.data)
+            self.assertIn(
+                '<li class="message">Hook Fedmsg inactived</li>',
+                output.data)
+            output = self.app.get('/test/settings/Fedmsg', data=data)
             self.assertTrue('<p>test project #1</p>' in output.data)
-            self.assertTrue('<h3>Fedmsg</h3>' in output.data)
-            self.assertTrue(
-                '<li class="message">Hook inactived</li>' in output.data)
-            self.assertTrue(
-                '<input id="active" name="active" type="checkbox" value="y">'
-                in output.data)
+            self.assertIn('<h3>Fedmsg</h3>', output.data)
+            self.assertIn(
+                '<input id="active" name="active" type="checkbox" value="y">',
+                output.data)
 
             self.assertFalse(os.path.exists(os.path.join(
                 tests.HERE, 'test.git', 'hooks', 'post-receive.fedmsg')))
@@ -107,12 +111,18 @@ class PagureFlaskPluginFedmsgtests(tests.Modeltests):
                 'active': 'y',
             }
 
-            output = self.app.post('/test/settings/Fedmsg', data=data)
+            output = self.app.post(
+                '/test/settings/Fedmsg', data=data, follow_redirects=True)
+            self.assertEqual(output.status_code, 200)
+            self.assertTrue('<h2>Settings</h2>' in output.data)
+            self.assertIn(
+                '<li class="message">Hook Fedmsg activated</li>',
+                output.data)
+            output = self.app.get('/test/settings/Fedmsg', data=data)
+            self.assertEqual(output.status_code, 200)
             self.assertTrue('<p>test project #1</p>' in output.data)
             self.assertTrue('<h3>Fedmsg</h3>' in output.data)
             self.assertTrue(
-                '<li class="message">Hook activated</li>' in output.data)
-            self.assertTrue(
                 '<input checked id="active" name="active" type="checkbox" '
                 'value="y">' in output.data)
 
@@ -121,12 +131,18 @@ class PagureFlaskPluginFedmsgtests(tests.Modeltests):
 
             # De-Activate hook
             data = {'csrf_token': csrf_token}
-            output = self.app.post('/test/settings/Fedmsg', data=data)
+            output = self.app.post(
+                '/test/settings/Fedmsg', data=data, follow_redirects=True)
+            self.assertEqual(output.status_code, 200)
+            self.assertTrue('<h2>Settings</h2>' in output.data)
+            self.assertIn(
+                '<li class="message">Hook Fedmsg inactived</li>',
+                output.data)
+            output = self.app.get('/test/settings/Fedmsg', data=data)
+            self.assertEqual(output.status_code, 200)
             self.assertTrue('<p>test project #1</p>' in output.data)
             self.assertTrue('<h3>Fedmsg</h3>' in output.data)
             self.assertTrue(
-                '<li class="message">Hook inactived</li>' in output.data)
-            self.assertTrue(
                 '<input id="active" name="active" type="checkbox" '
                 'value="y">' in output.data)
 
diff --git a/tests/test_progit_flask_ui_plugins_irc.py b/tests/test_progit_flask_ui_plugins_irc.py
index 02f3ca9..d5175c8 100644
--- a/tests/test_progit_flask_ui_plugins_irc.py
+++ b/tests/test_progit_flask_ui_plugins_irc.py
@@ -88,13 +88,18 @@ class PagureFlaskPluginIRCtests(tests.Modeltests):
             tests.create_projects_git(tests.HERE)
 
             # With the git repo
-            output = self.app.post('/test/settings/IRC', data=data)
+            output = self.app.post(
+                '/test/settings/IRC', data=data, follow_redirects=True)
+            self.assertEqual(output.status_code, 200)
+            self.assertTrue('<h2>Settings</h2>' in output.data)
+            self.assertTrue(
+                '<li class="message">Hook IRC inactived</li>' in output.data)
+
+            output = self.app.get('/test/settings/IRC')
             self.assertEqual(output.status_code, 200)
             self.assertTrue('<p>test project #1</p>' in output.data)
             self.assertTrue('<h3>IRC</h3>' in output.data)
             self.assertTrue(
-                '<li class="message">Hook inactived</li>' in output.data)
-            self.assertTrue(
                 '<input id="active" name="active" type="checkbox" value="y">'
                 in output.data)
 
@@ -110,12 +115,18 @@ class PagureFlaskPluginIRCtests(tests.Modeltests):
                 'room': '#fedora-apps',
             }
 
-            output = self.app.post('/test/settings/IRC', data=data)
+            output = self.app.post(
+                '/test/settings/IRC', data=data, follow_redirects=True)
+            self.assertEqual(output.status_code, 200)
+            self.assertTrue('<h2>Settings</h2>' in output.data)
+            self.assertTrue(
+                '<li class="message">Hook IRC activated</li>' in output.data)
+
+            output = self.app.get('/test/settings/IRC')
+            self.assertEqual(output.status_code, 200)
             self.assertTrue('<p>test project #1</p>' in output.data)
             self.assertTrue('<h3>IRC</h3>' in output.data)
             self.assertTrue(
-                '<li class="message">Hook activated</li>' in output.data)
-            self.assertTrue(
                 '<input checked id="active" name="active" type="checkbox" '
                 'value="y">' in output.data)
 
@@ -125,12 +136,17 @@ class PagureFlaskPluginIRCtests(tests.Modeltests):
 
             # De-Activate hook
             data = {'csrf_token': csrf_token}
-            output = self.app.post('/test/settings/IRC', data=data)
+            output = self.app.post('/test/settings/IRC', data=data, follow_redirects=True)
+            self.assertEqual(output.status_code, 200)
+            self.assertTrue('<h2>Settings</h2>' in output.data)
+            self.assertTrue(
+                '<li class="message">Hook IRC inactived</li>' in output.data)
+
+            output = self.app.get('/test/settings/IRC')
+            self.assertEqual(output.status_code, 200)
             self.assertTrue('<p>test project #1</p>' in output.data)
             self.assertTrue('<h3>IRC</h3>' in output.data)
             self.assertTrue(
-                '<li class="message">Hook inactived</li>' in output.data)
-            self.assertTrue(
                 '<input id="active" name="active" type="checkbox" '
                 'value="y">' in output.data)
 
diff --git a/tests/test_progit_flask_ui_plugins_mail.py b/tests/test_progit_flask_ui_plugins_mail.py
index 70489e3..b9f5132 100644
--- a/tests/test_progit_flask_ui_plugins_mail.py
+++ b/tests/test_progit_flask_ui_plugins_mail.py
@@ -91,13 +91,18 @@ class PagureFlaskPluginMailtests(tests.Modeltests):
             tests.create_projects_git(tests.HERE)
 
             # With the git repo
-            output = self.app.post('/test/settings/Mail', data=data)
+            output = self.app.post(
+                '/test/settings/Mail', data=data, follow_redirects=True)
+            self.assertEqual(output.status_code, 200)
+            self.assertTrue('<h2>Settings</h2>' in output.data)
+            self.assertTrue(
+                '<li class="message">Hook Mail inactived</li>' in output.data)
+
+            output = self.app.get('/test/settings/Mail')
             self.assertEqual(output.status_code, 200)
             self.assertTrue('<p>test project #1</p>' in output.data)
             self.assertTrue('<h3>Mail</h3>' in output.data)
             self.assertTrue(
-                '<li class="message">Hook inactived</li>' in output.data)
-            self.assertTrue(
                 '<td><label for="mail_to">Mail to</label></td>'
                 in output.data)
             self.assertTrue(
@@ -110,7 +115,9 @@ class PagureFlaskPluginMailtests(tests.Modeltests):
             # Missing the required mail_to
             data = {'csrf_token': csrf_token, 'active': 'y'}
 
-            output = self.app.post('/test/settings/Mail', data=data)
+            output = self.app.post(
+                '/test/settings/Mail', data=data, follow_redirects=True)
+            self.assertEqual(output.status_code, 200)
             self.assertTrue('<p>test project #1</p>' in output.data)
             self.assertTrue('<h3>Mail</h3>' in output.data)
             self.assertFalse(
@@ -133,12 +140,17 @@ class PagureFlaskPluginMailtests(tests.Modeltests):
                 'mail_to': 'foo@bar'
             }
 
-            output = self.app.post('/test/settings/Mail', data=data)
+            output = self.app.post(
+                '/test/settings/Mail', data=data, follow_redirects=True)
+            self.assertEqual(output.status_code, 200)
+            self.assertTrue('<h2>Settings</h2>' in output.data)
+            self.assertTrue(
+                '<li class="message">Hook Mail activated</li>' in output.data)
+
+            output = self.app.get('/test/settings/Mail')
             self.assertTrue('<p>test project #1</p>' in output.data)
             self.assertTrue('<h3>Mail</h3>' in output.data)
             self.assertTrue(
-                '<li class="message">Hook activated</li>' in output.data)
-            self.assertTrue(
                 '<td><label for="mail_to">Mail to</label></td>'
                 in output.data)
             self.assertTrue(
@@ -150,12 +162,17 @@ class PagureFlaskPluginMailtests(tests.Modeltests):
 
             # De-Activate hook
             data = {'csrf_token': csrf_token}
-            output = self.app.post('/test/settings/Mail', data=data)
+            output = self.app.post(
+                '/test/settings/Mail', data=data, follow_redirects=True)
+            self.assertEqual(output.status_code, 200)
+            self.assertTrue('<h2>Settings</h2>' in output.data)
+            self.assertTrue(
+                '<li class="message">Hook Mail inactived</li>' in output.data)
+
+            output = self.app.get('/test/settings/Mail')
             self.assertTrue('<p>test project #1</p>' in output.data)
             self.assertTrue('<h3>Mail</h3>' in output.data)
             self.assertTrue(
-                '<li class="message">Hook inactived</li>' in output.data)
-            self.assertTrue(
                 '<td><label for="mail_to">Mail to</label></td>'
                 in output.data)
             self.assertTrue(
diff --git a/tests/test_progit_flask_ui_plugins_progit_hook.py b/tests/test_progit_flask_ui_plugins_progit_hook.py
index 09d2cee..107d82a 100644
--- a/tests/test_progit_flask_ui_plugins_progit_hook.py
+++ b/tests/test_progit_flask_ui_plugins_progit_hook.py
@@ -45,6 +45,8 @@ class PagureFlaskPluginPagureHooktests(tests.Modeltests):
             tests.HERE, 'forks')
         pagure.APP.config['TICKETS_FOLDER'] = os.path.join(
             tests.HERE, 'tickets')
+        pagure.APP.config['REQUESTS_FOLDER'] = os.path.join(
+            tests.HERE, 'requests')
         pagure.APP.config['DOCS_FOLDER'] = os.path.join(
             tests.HERE, 'docs')
         self.app = pagure.APP.test_client()
@@ -87,13 +89,19 @@ class PagureFlaskPluginPagureHooktests(tests.Modeltests):
             tests.create_projects_git(os.path.join(tests.HERE, 'requests'))
 
             # With the git repo
-            output = self.app.post('/test/settings/pagure', data=data)
+            output = self.app.post(
+                '/test/settings/pagure', data=data, follow_redirects=True)
+            self.assertEqual(output.status_code, 200)
+            self.assertTrue('<h2>Settings</h2>' in output.data)
+            self.assertTrue(
+                '<li class="message">Hook pagure inactived</li>'
+                in output.data)
+
+            output = self.app.get('/test/settings/pagure')
             self.assertEqual(output.status_code, 200)
             self.assertTrue('<p>test project #1</p>' in output.data)
             self.assertTrue('<h3>pagure</h3>' in output.data)
             self.assertTrue(
-                '<li class="message">Hook inactived</li>' in output.data)
-            self.assertTrue(
                 '<input id="active" name="active" type="checkbox" value="y">'
                 in output.data)
 
@@ -106,12 +114,19 @@ class PagureFlaskPluginPagureHooktests(tests.Modeltests):
                 'active': 'y',
             }
 
-            output = self.app.post('/test/settings/pagure', data=data)
+            output = self.app.post(
+                '/test/settings/pagure', data=data, follow_redirects=True)
+            self.assertEqual(output.status_code, 200)
+            self.assertTrue('<h2>Settings</h2>' in output.data)
+            self.assertTrue(
+                '<li class="message">Hook pagure activated</li>'
+                in output.data)
+
+            output = self.app.get('/test/settings/pagure')
+            self.assertEqual(output.status_code, 200)
             self.assertTrue('<p>test project #1</p>' in output.data)
             self.assertTrue('<h3>pagure</h3>' in output.data)
             self.assertTrue(
-                '<li class="message">Hook activated</li>' in output.data)
-            self.assertTrue(
                 '<input checked id="active" name="active" type="checkbox" '
                 'value="y">' in output.data)
 
@@ -120,12 +135,19 @@ class PagureFlaskPluginPagureHooktests(tests.Modeltests):
 
             # De-Activate hook
             data = {'csrf_token': csrf_token}
-            output = self.app.post('/test/settings/pagure', data=data)
+            output = self.app.post(
+                '/test/settings/pagure', data=data, follow_redirects=True)
+            self.assertEqual(output.status_code, 200)
+            self.assertTrue('<h2>Settings</h2>' in output.data)
+            self.assertTrue(
+                '<li class="message">Hook pagure inactived</li>'
+                in output.data)
+
+            output = self.app.get('/test/settings/pagure')
+            self.assertEqual(output.status_code, 200)
             self.assertTrue('<p>test project #1</p>' in output.data)
             self.assertTrue('<h3>pagure</h3>' in output.data)
             self.assertTrue(
-                '<li class="message">Hook inactived</li>' in output.data)
-            self.assertTrue(
                 '<input id="active" name="active" type="checkbox" '
                 'value="y">' in output.data)
 
diff --git a/tests/test_progit_flask_ui_plugins_progit_request_hook.py b/tests/test_progit_flask_ui_plugins_progit_request_hook.py
index 2245a4a..a073fef 100644
--- a/tests/test_progit_flask_ui_plugins_progit_request_hook.py
+++ b/tests/test_progit_flask_ui_plugins_progit_request_hook.py
@@ -86,13 +86,20 @@ class PagureFlaskPluginPagureRequestHooktests(tests.Modeltests):
             tests.create_projects_git(os.path.join(tests.HERE, 'requests'))
 
             # With the git repo
-            output = self.app.post('/test/settings/pagure requests', data=data)
+            output = self.app.post(
+                '/test/settings/pagure requests', data=data,
+                follow_redirects=True)
+            self.assertEqual(output.status_code, 200)
+            self.assertTrue('<h2>Settings</h2>' in output.data)
+            self.assertTrue(
+                '<li class="message">Hook pagure requests inactived</li>'
+                in output.data)
+
+            output = self.app.get('/test/settings/pagure requests')
             self.assertEqual(output.status_code, 200)
             self.assertTrue('<p>test project #1</p>' in output.data)
             self.assertTrue('<h3>pagure requests</h3>' in output.data)
             self.assertTrue(
-                '<li class="message">Hook inactived</li>' in output.data)
-            self.assertTrue(
                 '<input id="active" name="active" type="checkbox" value="y">'
                 in output.data)
 
@@ -106,13 +113,20 @@ class PagureFlaskPluginPagureRequestHooktests(tests.Modeltests):
                 'active': 'y',
             }
 
-            output = self.app.post('/test/settings/pagure requests', data=data)
+            output = self.app.post(
+                '/test/settings/pagure requests', data=data,
+                follow_redirects=True)
+            self.assertEqual(output.status_code, 200)
+            self.assertTrue('<h2>Settings</h2>' in output.data)
+            self.assertTrue(
+                '<li class="message">Hook pagure requests activated</li>'
+                in output.data)
+
+            output = self.app.get('/test/settings/pagure requests')
             self.assertEqual(output.status_code, 200)
             self.assertTrue('<p>test project #1</p>' in output.data)
             self.assertTrue('<h3>pagure requests</h3>' in output.data)
             self.assertTrue(
-                '<li class="message">Hook activated</li>' in output.data)
-            self.assertTrue(
                 '<input checked id="active" name="active" type="checkbox" '
                 'value="y">' in output.data)
 
@@ -122,12 +136,20 @@ class PagureFlaskPluginPagureRequestHooktests(tests.Modeltests):
 
             # De-Activate hook
             data = {'csrf_token': csrf_token}
-            output = self.app.post('/test/settings/pagure requests', data=data)
+            output = self.app.post(
+                '/test/settings/pagure requests', data=data,
+                follow_redirects=True)
+            self.assertEqual(output.status_code, 200)
+            self.assertTrue('<h2>Settings</h2>' in output.data)
+            self.assertTrue(
+                '<li class="message">Hook pagure requests inactived</li>'
+                in output.data)
+
+            output = self.app.get('/test/settings/pagure requests')
+            self.assertEqual(output.status_code, 200)
             self.assertTrue('<p>test project #1</p>' in output.data)
             self.assertTrue('<h3>pagure requests</h3>' in output.data)
             self.assertTrue(
-                '<li class="message">Hook inactived</li>' in output.data)
-            self.assertTrue(
                 '<input id="active" name="active" type="checkbox" '
                 'value="y">' in output.data)
 
diff --git a/tests/test_progit_flask_ui_plugins_progit_ticket_hook.py b/tests/test_progit_flask_ui_plugins_progit_ticket_hook.py
index d27dce6..1b47bd0 100644
--- a/tests/test_progit_flask_ui_plugins_progit_ticket_hook.py
+++ b/tests/test_progit_flask_ui_plugins_progit_ticket_hook.py
@@ -86,13 +86,20 @@ class PagureFlaskPluginPagureTicketHooktests(tests.Modeltests):
             tests.create_projects_git(os.path.join(tests.HERE, 'tickets'))
 
             # With the git repo
-            output = self.app.post('/test/settings/pagure tickets', data=data)
+            output = self.app.post(
+                '/test/settings/pagure tickets', data=data,
+                follow_redirects=True)
+            self.assertEqual(output.status_code, 200)
+            self.assertTrue('<h2>Settings</h2>' in output.data)
+            self.assertTrue(
+                '<li class="message">Hook pagure tickets inactived</li>'
+                in output.data)
+
+            output = self.app.get('/test/settings/pagure tickets')
             self.assertEqual(output.status_code, 200)
             self.assertTrue('<p>test project #1</p>' in output.data)
             self.assertTrue('<h3>pagure tickets</h3>' in output.data)
             self.assertTrue(
-                '<li class="message">Hook inactived</li>' in output.data)
-            self.assertTrue(
                 '<input id="active" name="active" type="checkbox" value="y">'
                 in output.data)
 
@@ -106,13 +113,20 @@ class PagureFlaskPluginPagureTicketHooktests(tests.Modeltests):
                 'active': 'y',
             }
 
-            output = self.app.post('/test/settings/pagure tickets', data=data)
+            output = self.app.post(
+                '/test/settings/pagure tickets', data=data,
+                follow_redirects=True)
+            self.assertEqual(output.status_code, 200)
+            self.assertTrue('<h2>Settings</h2>' in output.data)
+            self.assertTrue(
+                '<li class="message">Hook pagure tickets activated</li>'
+                in output.data)
+
+            output = self.app.get('/test/settings/pagure tickets')
             self.assertEqual(output.status_code, 200)
             self.assertTrue('<p>test project #1</p>' in output.data)
             self.assertTrue('<h3>pagure tickets</h3>' in output.data)
             self.assertTrue(
-                '<li class="message">Hook activated</li>' in output.data)
-            self.assertTrue(
                 '<input checked id="active" name="active" type="checkbox" '
                 'value="y">' in output.data)
 
@@ -122,12 +136,20 @@ class PagureFlaskPluginPagureTicketHooktests(tests.Modeltests):
 
             # De-Activate hook
             data = {'csrf_token': csrf_token}
-            output = self.app.post('/test/settings/pagure tickets', data=data)
+            output = self.app.post(
+                '/test/settings/pagure tickets', data=data,
+                follow_redirects=True)
+            self.assertEqual(output.status_code, 200)
+            self.assertTrue('<h2>Settings</h2>' in output.data)
+            self.assertTrue(
+                '<li class="message">Hook pagure tickets inactived</li>'
+                in output.data)
+
+            output = self.app.get('/test/settings/pagure tickets')
+            self.assertEqual(output.status_code, 200)
             self.assertTrue('<p>test project #1</p>' in output.data)
             self.assertTrue('<h3>pagure tickets</h3>' in output.data)
             self.assertTrue(
-                '<li class="message">Hook inactived</li>' in output.data)
-            self.assertTrue(
                 '<input id="active" name="active" type="checkbox" '
                 'value="y">' in output.data)