diff options
Diffstat (limited to 'public')
| -rw-r--r-- | public/tests.py | 21 | ||||
| -rw-r--r-- | public/views.py | 24 |
2 files changed, 16 insertions, 29 deletions
diff --git a/public/tests.py b/public/tests.py index 565d57ec..d0140e98 100644 --- a/public/tests.py +++ b/public/tests.py @@ -13,14 +13,22 @@ class PublicTest(TestCase): def test_art(self): response = self.client.get('/art/') - self.assertEqual(response.status_code, 200) + self.assertEqual(response.status_code, 302) + self.assertTrue(response['Location'].startswith( + 'https://projects.parabola.nu/artwork.git/') def test_svn(self): response = self.client.get('/svn/') - self.assertEqual(response.status_code, 200) + # Parabola has no SVN. + self.assertEqual(response.status_code, 404) def test_developers(self): response = self.client.get('/developers/') + self.assertEqual(response.status_code, 301) + self.assertTrue(response['Location'].endswith('/hackers/')) + + def test_hackers(self): + response = self.client.get('/hackers/') self.assertEqual(response.status_code, 200) def test_fellows(self): @@ -29,9 +37,12 @@ class PublicTest(TestCase): def test_donate(self): response = self.client.get('/donate/') - self.assertEqual(response.status_code, 200) + self.assertEqual(response.status_code, 302) + self.assertEqual(response['Location'], + 'https://wiki.parabola.nu/Donations') def test_download(self): response = self.client.get('/download/') - self.assertEqual(response.status_code, 200) - + self.assertEqual(response.status_code, 302) + self.assertEqual(response['Location'], + 'https://wiki.parabola.nu/Get_Parabola') diff --git a/public/views.py b/public/views.py index 7dd0528c..af0c1ff6 100644 --- a/public/views.py +++ b/public/views.py @@ -43,14 +43,6 @@ def people(request, slug): return render(request, 'public/userlist.html', context) -@cache_control(max_age=307) -def donate(request): - context = { - 'donors': Donor.objects.filter(visible=True).order_by('name'), - } - return render(request, 'public/donate.html', context) - - def _mirror_urls(): '''In order to ensure this is lazily evaluated since we can't do sorting at the database level, make it a callable.''' @@ -62,22 +54,6 @@ def _mirror_urls(): @cache_control(max_age=307) -def download(request): - try: - release = Release.objects.filter(available=True).latest() - except Release.DoesNotExist: - release = None - - context = { - 'release': release, - 'releng_iso_url': settings.ISO_LIST_URL, - 'releng_pxeboot_url': settings.PXEBOOT_URL, - 'mirror_urls': _mirror_urls, - } - return render(request, 'public/download.html', context) - - -@cache_control(max_age=307) def feeds(request): repos = Repo.objects.all() if not request.user.is_authenticated(): |