Merge pull request readthedocs#5308 from stsewd/rstrip-repo-url

Rstrip repo url

Author: stsewd

readthedocs/projects/forms.py

@@ -131,6 +131,10 @@ def clean_name(self):
 
         return name
 
+    def clean_repo(self):
+        repo = self.cleaned_data.get('repo', '')
+        return repo.rstrip('/')
+
     def clean_remote_repository(self):
         remote_repo = self.cleaned_data.get('remote_repository', None)
         if not remote_repo:

readthedocs/rtd_tests/tests/test_project_forms.py

@@ -1,12 +1,9 @@
-# -*- coding: utf-8 -*-
-
 import mock
 from django.contrib.auth.models import User
 from django.test import TestCase
 from django.test.utils import override_settings
 from django_dynamic_fixture import get
 from textclassifier.validators import ClassifierValidator
-from django.core.exceptions import ValidationError
 
 from readthedocs.builds.constants import LATEST
 from readthedocs.builds.models import Version
@@ -180,6 +177,18 @@ def test_length_of_tags(self):
         error_msg = 'Length of each tag must be less than or equal to 100 characters.'
         self.assertDictEqual(form.errors, {'tags': [error_msg]})
 
+    def test_strip_repo_url(self):
+        form = ProjectBasicsForm({
+            'name': 'foo',
+            'repo_type': 'git',
+            'repo': 'https://github.com/rtfd/readthedocs.org/'
+        })
+        self.assertTrue(form.is_valid())
+        self.assertEqual(
+            form.cleaned_data['repo'],
+            'https://github.com/rtfd/readthedocs.org'
+        )
+
 
 class TestProjectAdvancedForm(TestCase):
 
@@ -514,7 +523,7 @@ class TestNotificationForm(TestCase):
 
     def setUp(self):
         self.project = get(Project)
-        
+
     def test_webhookform(self):
         self.assertEqual(self.project.webhook_notifications.all().count(), 0)