Browse Source

Allow editing the URL a project is mirrored from

When a project is mirrored from a remote location to a local pagure
instance, we so far had no way to edit this url, for example for
when the upstream project changes location.
With this commit we're able to fix this.

Fixes https://pagure.io/pagure/issue/4647

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>
Pierre-Yves Chibon 3 years ago
parent
commit
c78ea50ecf

+ 4 - 0
pagure/forms.py

@@ -159,6 +159,10 @@ class ProjectFormSimplified(PagureForm):
     private = wtforms.BooleanField(
         "Private", [wtforms.validators.Optional()], false_values=FALSE_VALUES
     )
+    mirrored_from = wtforms.StringField(
+        "Mirrored from",
+        [wtforms.validators.optional(), wtforms.validators.Length(max=255)],
+    )
 
 
 class ProjectForm(ProjectFormSimplified):

+ 9 - 0
pagure/templates/settings.html

@@ -160,6 +160,15 @@
                         <span class="c-indicator"></span>
                     </fieldset>
                 {% endif %}
+                {% if repo.mirrored_from %}
+                    <fieldset class="form-group">
+                      <label for="tags">Mirrored from</label>
+                      <input class="form-control" name="mirrored_from" value="{{ repo.mirrored_from }}" />
+                      <small class="text-muted">
+                        The (public) url from which this repository is mirrored.
+                      </small>
+                    </fieldset>
+                {% endif %}
                 <button class="btn btn-primary" type="submit" title="Update description">
                   Update
                 </button>

+ 2 - 0
pagure/ui/repo.py

@@ -1421,6 +1421,8 @@ def update_project(repo, username=None, namespace=None):
             repo.url = form.url.data.strip()
             if repo.private:
                 repo.private = form.private.data
+            if repo.mirrored_from:
+                repo.mirrored_from = form.mirrored_from.data
             pagure.lib.query.update_tags(
                 flask.g.session,
                 repo,

+ 128 - 0
tests/test_pagure_flask_ui_repo_mirrored_from.py

@@ -0,0 +1,128 @@
+# -*- coding: utf-8 -*-
+
+"""
+ (c) 2020 - Copyright Red Hat Inc
+
+ Authors:
+   Pierre-Yves Chibon <pingou@pingoured.fr>
+
+"""
+
+from __future__ import unicode_literals, absolute_import
+
+import datetime
+import os
+import shutil
+import sys
+import tempfile
+import time
+import unittest
+
+import pygit2
+import six
+from mock import patch, MagicMock, ANY, call
+
+sys.path.insert(
+    0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "..")
+)
+
+import pagure.lib.git
+import tests
+
+from pagure.lib.repo import PagureRepo
+
+
+class PagureUiRepoMirroredFromTests(tests.Modeltests):
+    """ Tests for pagure project that are mirrored from a remote location
+    """
+
+    maxDiff = None
+
+    def setUp(self):
+        """ Set up the environnment, ran before every tests. """
+        super(PagureUiRepoMirroredFromTests, self).setUp()
+
+        tests.create_projects(self.session)
+        tests.create_projects_git(os.path.join(self.path, "repos"), bare=True)
+
+        # Make the test project mirrored from elsewhere
+        self.project = pagure.lib.query.get_authorized_project(
+            self.session, "test"
+        )
+        self.project.mirrored_from = "https://example.com/foo/bar.git"
+        self.session.add(self.project)
+        self.session.commit()
+
+    def test_settings_shows(self):
+        """ Ensure that the box to edit the mirrored from value shows up
+        in the settings.
+        """
+        user = tests.FakeUser(username="pingou")
+        with tests.user_set(self.app.application, user):
+            output = self.app.get("/test/settings")
+            self.assertEqual(output.status_code, 200)
+            output_text = output.get_data(as_text=True)
+            self.assertIn(
+                '<input class="form-control" name="mirrored_from" '
+                'value="https://example.com/foo/bar.git" />',
+                output_text,
+            )
+            self.assertIn(
+                "The (public) url from which this repository is mirrored.",
+                output_text,
+            )
+
+    def test_settings_not_show(self):
+        """ Ensure that the box to edit the mirrored from value does not
+        show up in the settings when it shouldn't.
+        """
+        user = tests.FakeUser(username="pingou")
+        with tests.user_set(self.app.application, user):
+            output = self.app.get("/test2/settings")
+            self.assertEqual(output.status_code, 200)
+            output_text = output.get_data(as_text=True)
+            self.assertNotIn(
+                '<input class="form-control" name="mirrored_from" ',
+                output_text,
+            )
+            self.assertNotIn(
+                "The (public) url from which this repository is mirrored.",
+                output_text,
+            )
+
+    def test_edit_mirrored_from(self):
+        """ Ensure that we can successfully edit the content of the
+        mirrored_from field.
+        """
+        user = tests.FakeUser(username="pingou")
+        with tests.user_set(self.app.application, user):
+            output = self.app.get("/test/settings")
+            self.assertEqual(output.status_code, 200)
+            output_text = output.get_data(as_text=True)
+            self.assertIn(
+                '<input class="form-control" name="mirrored_from" '
+                'value="https://example.com/foo/bar.git" />',
+                output_text,
+            )
+
+            csrf_token = self.get_csrf(output=output)
+
+            data = {
+                "csrf_token": csrf_token,
+                "description": "test repo",
+                "mirrored_from": "https://example2.com/bar.git",
+            }
+            output = self.app.post(
+                "/test/update", data=data, follow_redirects=True
+            )
+            self.assertEqual(output.status_code, 200)
+            output_text = output.get_data(as_text=True)
+            self.assertIn(
+                '<input class="form-control" name="mirrored_from" '
+                'value="https://example2.com/bar.git" />',
+                output_text,
+            )
+
+
+if __name__ == "__main__":
+    unittest.main(verbosity=2)