From d490c704b8c66ded63e3a928aec401d7d3017a69 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Sep 07 2017 09:06:36 +0000
Subject: Fix showing the delete project button


We want to show it when it is enabled, not the other way around.

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

---

diff --git a/pagure/templates/settings.html b/pagure/templates/settings.html
index 0c30864..64e7080 100644
--- a/pagure/templates/settings.html
+++ b/pagure/templates/settings.html
@@ -1092,7 +1092,7 @@
 
     {% if (not repo.is_fork and config.get('ENABLE_DEL_PROJECTS', True))
           or
-          (repo.is_fork and not config.get('ENABLE_DEL_FORKS',
+          (repo.is_fork and config.get('ENABLE_DEL_FORKS',
                 config.get('ENABLE_DEL_PROJECTS', True))) %}
     <div class="col-md-8 col-md-offset-2">
       <div class="card">
diff --git a/tests/test_pagure_flask_ui_repo_delete_project.py b/tests/test_pagure_flask_ui_repo_delete_project.py
index b26e508..902d1e5 100644
--- a/tests/test_pagure_flask_ui_repo_delete_project.py
+++ b/tests/test_pagure_flask_ui_repo_delete_project.py
@@ -88,6 +88,43 @@ class PagureFlaskDeleteRepotests(tests.Modeltests):
         projects = pagure.lib.search_projects(self.session)
         self.assertEqual(len(projects), 4)
 
+    @patch('pagure.lib.notify.send_email', MagicMock(return_value=True))
+    @patch('pagure.ui.repo.admin_session_timedout',
+           MagicMock(return_value=False))
+    def test_delete_button_present(self):
+        """ Test that the delete button is present when deletions are
+        allowed.
+        """
+
+        user = tests.FakeUser(username='pingou')
+        with tests.user_set(pagure.APP, user):
+            output = self.app.get('/test/settings')
+            self.assertEqual(output.status_code, 200)
+            self.assertIn('<form action="/test/delete"', output.data)
+            self.assertIn('&nbsp; Delete the test project', output.data)
+
+        projects = pagure.lib.search_projects(self.session)
+        self.assertEqual(len(projects), 4)
+
+    @patch.dict('pagure.APP.config', {'ENABLE_DEL_PROJECTS': False})
+    @patch('pagure.lib.notify.send_email', MagicMock(return_value=True))
+    @patch('pagure.ui.repo.admin_session_timedout',
+           MagicMock(return_value=False))
+    def test_delete_button_absent(self):
+        """ Test that the delete button is absent when deletions are not
+        allowed.
+        """
+
+        user = tests.FakeUser(username='pingou')
+        with tests.user_set(pagure.APP, user):
+            output = self.app.get('/test/settings')
+            self.assertEqual(output.status_code, 200)
+            self.assertNotIn('<form action="/test/delete"', output.data)
+            self.assertNotIn('&nbsp; Delete the test project', output.data)
+
+        projects = pagure.lib.search_projects(self.session)
+        self.assertEqual(len(projects), 4)
+
     @patch.dict('pagure.APP.config', {'ENABLE_DEL_PROJECTS': False})
     @patch.dict('pagure.APP.config', {'ENABLE_DEL_FORKS': True})
     @patch('pagure.lib.notify.send_email', MagicMock(return_value=True))
@@ -125,3 +162,43 @@ class PagureFlaskDeleteRepotests(tests.Modeltests):
 
         projects = pagure.lib.search_projects(self.session)
         self.assertEqual(len(projects), 4)
+
+    @patch.dict('pagure.APP.config', {'ENABLE_DEL_PROJECTS': False})
+    @patch.dict('pagure.APP.config', {'ENABLE_DEL_FORKS': False})
+    @patch('pagure.lib.notify.send_email', MagicMock(return_value=True))
+    @patch('pagure.ui.repo.admin_session_timedout',
+           MagicMock(return_value=False))
+    def test_delete_fork_button_absent(self):
+        """ Test that the delete button is absent when deletions are not
+        allowed.
+        """
+
+        user = tests.FakeUser(username='pingou')
+        with tests.user_set(pagure.APP, user):
+            output = self.app.get('/fork/pingou/test/settings')
+            self.assertEqual(output.status_code, 200)
+            self.assertNotIn('<form action="/fork/pingou/test/delete"', output.data)
+            self.assertNotIn('&nbsp; Delete the forks/pingou/test project', output.data)
+
+        projects = pagure.lib.search_projects(self.session)
+        self.assertEqual(len(projects), 4)
+
+    @patch.dict('pagure.APP.config', {'ENABLE_DEL_PROJECTS': False})
+    @patch.dict('pagure.APP.config', {'ENABLE_DEL_FORKS': True})
+    @patch('pagure.lib.notify.send_email', MagicMock(return_value=True))
+    @patch('pagure.ui.repo.admin_session_timedout',
+           MagicMock(return_value=False))
+    def test_delete_fork_button_fork_del_allowed(self):
+        """ Test that the delete button is present when deletions of projects
+        is not allowed but deletions of forks is.
+        """
+
+        user = tests.FakeUser(username='pingou')
+        with tests.user_set(pagure.APP, user):
+            output = self.app.get('/fork/pingou/test/settings')
+            self.assertEqual(output.status_code, 200)
+            self.assertIn('<form action="/fork/pingou/test/delete"', output.data)
+            self.assertIn('&nbsp; Delete the forks/pingou/test project', output.data)
+
+        projects = pagure.lib.search_projects(self.session)
+        self.assertEqual(len(projects), 4)