Merge ~pappacena/launchpad:allow-delete-gitrepo-while-creating into launchpad:master

[Thiago F. Pappacena]

Allowing users to delete git repositories while they are creating

We don't have any strong constraint on allowing users to delete on Launchpad a repository that is being created on Turnip side. If that happens, the repository confirmation on Turnip will fail, and the forked repository should be deleted from filesystem correctly.

[Colin Watson (cjwatson)]

review: Approve

c200545... by Thiago F. Pappacena on 2021-04-07

Removing unsued attribute

diff --git a/lib/lp/code/browser/gitrepository.py b/lib/lp/code/browser/gitrepository.py
index 76606cd..25fd6de 100644
--- a/lib/lp/code/browser/gitrepository.py
+++ b/lib/lp/code/browser/gitrepository.py
@@ -1,4 +1,4 @@
-# Copyright 2015-2020 Canonical Ltd.  This software is licensed under the
+# Copyright 2015-2021 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Git repository views."""
@@ -1376,8 +1376,6 @@ class GitRepositoryDeletionView(LaunchpadFormView):
 
         Uses display_deletion_requirements as its source data.
         """
-        if self.context.status == GitRepositoryStatus.CREATING:
-            return False
         return len([item for item, action, reason, allowed in
             self.display_deletion_requirements if not allowed]) == 0
 
@@ -1418,12 +1416,6 @@ class GitRepositoryDeletionView(LaunchpadFormView):
     def cancel_url(self):
         return canonical_url(self.context)
 
-    @property
-    def warning_message(self):
-        if self.context.status == GitRepositoryStatus.CREATING:
-            return "This repository is being created and cannot be deleted."
-        return None
-
 
 class GitRepositoryActivityView(LaunchpadView):
 
diff --git a/lib/lp/code/browser/tests/test_gitrepository.py b/lib/lp/code/browser/tests/test_gitrepository.py
index 5a17f6e..8dadb9d 100644
--- a/lib/lp/code/browser/tests/test_gitrepository.py
+++ b/lib/lp/code/browser/tests/test_gitrepository.py
@@ -1,4 +1,4 @@
-# Copyright 2015-2020 Canonical Ltd.  This software is licensed under the
+# Copyright 2015-2021 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Unit tests for GitRepositoryView."""
@@ -2016,30 +2016,11 @@ class TestGitRepositoryDeletionView(BrowserTestCase):
         delete_link = browser.getLink("Delete repository")
         self.assertEqual(delete_url, delete_link.url)
 
-    def test_creating_warning_message_is_present(self):
-        # If the repository is not being created, we should show the
-        # warning message, and suppress the "delete" button.
-        repository = removeSecurityProxy(self.factory.makeGitRepository())
-        repository.status = GitRepositoryStatus.CREATING
-        browser = self.getViewBrowser(
-            repository, "+delete", rootsite="code", user=repository.owner)
-
-        # Warning message is present.
-        tag = find_tags_by_class(browser.contents, "warning message", True)
-        self.assertIsNotNone(tag)
-        self.assertIn(
-            "This repository is being created and cannot be deleted.",
-            ' '.join(tag.contents))
-        # Delete button is not present
-        tag = find_tag_by_id(
-            browser.contents, "field.actions.delete_repository")
-        self.assertIsNone(tag)
-
-    def test_creating_warning_message_is_not_shown(self):
-        # If the repository is not being created, we should not show the
+    def test_can_delete_creating_repository(self):
+        # Even if the repository is being created, we should not show the
         # warning message, and the "delete" button should be present.
         repository = removeSecurityProxy(self.factory.makeGitRepository())
-        repository.status = GitRepositoryStatus.AVAILABLE
+        repository.status = GitRepositoryStatus.CREATING
         browser = self.getViewBrowser(
             repository, "+delete", rootsite="code", user=repository.owner)
 
diff --git a/lib/lp/code/templates/gitrepository-delete.pt b/lib/lp/code/templates/gitrepository-delete.pt
index 3e92b6b..2405139 100644
--- a/lib/lp/code/templates/gitrepository-delete.pt
+++ b/lib/lp/code/templates/gitrepository-delete.pt
@@ -8,13 +8,6 @@
 <body>
 
   <div metal:fill-slot="main">
-  <div class="top-portlet" style="padding-top:0.5em;">
-    <p tal:condition="view/warning_message"
-       style="clear: right;" class="warning message"
-       tal:content="view/warning_message">
-      There is a warning here.
-    </p>
-  </div>
 
   <tal:deletelist condition="view/repository_deletion_actions/delete">
     The following items must be <em>deleted</em>: