Skip to content

Commit fc8d84c

Browse files
stsewdstsewd
committed
Fix tests
1 parent 68c1c6d commit fc8d84c

File tree

4 files changed

+56
-155
lines changed

4 files changed

+56
-155
lines changed

‎common

‎readthedocs/rtd_tests/tests/test_core_tags.py

+11-115
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: utf-8 -*-
21
import mock
32
import pytest
43
from django.conf import settings
@@ -21,16 +20,15 @@ def setUp(self):
2120
)
2221

2322
self.pip_latest_url = url_base.format(version='/en/latest/')
23+
self.pip_latest_url_index = url_base.format(version='/en/latest/index.html')
2424
self.pip_latest_fr_url = url_base.format(version='/fr/latest/')
2525
self.pip_abc_url = url_base.format(version='/en/abc/')
26+
self.pip_abc_url_index = url_base.format(version='/en/abc/index.html')
2627
self.pip_abc_fr_url = url_base.format(version='/fr/abc/')
27-
self.pip_abc_xyz_page_url = url_base.format(version='/en/abc/xyz.html')
28-
self.pip_abc_xyz_fr_page_url = url_base.format(version='/fr/abc/xyz.html')
29-
self.pip_abc_xyz_dir_url = url_base.format(version='/en/abc/xyz/')
30-
self.pip_abc_xyz_fr_dir_url = url_base.format(version='/fr/abc/xyz/')
31-
self.pip_abc_xyz_document = url_base.format(version='/en/abc/index.html#document-xyz')
32-
self.pip_abc_xyz_fr_document = url_base.format(version='/fr/abc/index.html#document-xyz')
33-
self.pip_latest_document_url = url_base.format(version='/en/latest/document/')
28+
self.pip_abc_fr_url_index = url_base.format(version='/fr/abc/index.html')
29+
self.pip_abc_xyz_page_url = url_base.format(version='/en/abc/xyz')
30+
self.pip_abc_xyz_fr_page_url = url_base.format(version='/fr/abc/xyz')
31+
self.pip_latest_document_url = url_base.format(version='/en/latest/document')
3432
self.pip_latest_document_page_url = url_base.format(version='/en/latest/document.html')
3533

3634
with mock.patch('readthedocs.projects.models.broadcast'):
@@ -45,136 +43,40 @@ def test_project_only(self):
4543
url = core_tags.make_document_url(proj, '')
4644
self.assertEqual(url, self.pip_latest_url)
4745

48-
def test_project_only_htmldir(self):
49-
proj = Project.objects.get(slug='pip')
50-
proj.documentation_type = 'sphinx_htmldir'
51-
url = core_tags.make_document_url(proj)
52-
self.assertEqual(url, self.pip_latest_url)
53-
url = core_tags.make_document_url(proj, '')
54-
self.assertEqual(url, self.pip_latest_url)
55-
56-
def test_project_only_singlehtml(self):
57-
proj = Project.objects.get(slug='pip')
58-
proj.documentation_type = 'sphinx_singlehtml'
59-
url = core_tags.make_document_url(proj)
60-
self.assertEqual(url, self.pip_latest_url)
61-
url = core_tags.make_document_url(proj, '')
62-
self.assertEqual(url, self.pip_latest_url)
63-
6446
def test_translation_project_only(self):
6547
proj = Project.objects.get(slug='pip-fr')
6648
url = core_tags.make_document_url(proj)
6749
self.assertEqual(url, self.pip_latest_fr_url)
6850
url = core_tags.make_document_url(proj, '')
6951
self.assertEqual(url, self.pip_latest_fr_url)
7052

71-
def test_translation_project_only_htmldir(self):
72-
proj = Project.objects.get(slug='pip-fr')
73-
proj.documentation_type = 'sphinx_htmldir'
74-
url = core_tags.make_document_url(proj)
75-
self.assertEqual(url, self.pip_latest_fr_url)
76-
url = core_tags.make_document_url(proj, '')
77-
self.assertEqual(url, self.pip_latest_fr_url)
78-
79-
def test_translation_project_only_singlehtml(self):
80-
proj = Project.objects.get(slug='pip-fr')
81-
proj.documentation_type = 'sphinx_singlehtml'
82-
url = core_tags.make_document_url(proj)
83-
self.assertEqual(url, self.pip_latest_fr_url)
84-
url = core_tags.make_document_url(proj, '')
85-
self.assertEqual(url, self.pip_latest_fr_url)
86-
8753
def test_project_and_version(self):
8854
proj = Project.objects.get(slug='pip')
8955
url = core_tags.make_document_url(proj, 'abc')
9056
self.assertEqual(url, self.pip_abc_url)
9157
url = core_tags.make_document_url(proj, 'abc', '')
9258
self.assertEqual(url, self.pip_abc_url)
9359

94-
def test_project_and_version_htmldir(self):
95-
proj = Project.objects.get(slug='pip')
96-
proj.documentation_type = 'sphinx_htmldir'
97-
url = core_tags.make_document_url(proj, 'abc')
98-
self.assertEqual(url, self.pip_abc_url)
99-
url = core_tags.make_document_url(proj, 'abc', '')
100-
self.assertEqual(url, self.pip_abc_url)
101-
102-
def test_project_and_version_singlehtml(self):
103-
proj = Project.objects.get(slug='pip')
104-
proj.documentation_type = 'sphinx_singlehtml'
105-
url = core_tags.make_document_url(proj, 'abc')
106-
self.assertEqual(url, self.pip_abc_url)
107-
url = core_tags.make_document_url(proj, 'abc', '')
108-
self.assertEqual(url, self.pip_abc_url)
109-
11060
def test_translation_project_and_version(self):
11161
proj = Project.objects.get(slug='pip-fr')
11262
url = core_tags.make_document_url(proj, 'abc')
11363
self.assertEqual(url, self.pip_abc_fr_url)
11464
url = core_tags.make_document_url(proj, 'abc', '')
11565
self.assertEqual(url, self.pip_abc_fr_url)
11666

117-
def test_translation_project_and_version_htmldir(self):
118-
proj = Project.objects.get(slug='pip-fr')
119-
proj.documentation_type = 'sphinx_htmldir'
120-
url = core_tags.make_document_url(proj, 'abc')
121-
self.assertEqual(url, self.pip_abc_fr_url)
122-
url = core_tags.make_document_url(proj, 'abc', '')
123-
self.assertEqual(url, self.pip_abc_fr_url)
124-
125-
def test_translation_project_and_version_singlehtml(self):
126-
proj = Project.objects.get(slug='pip-fr')
127-
proj.documentation_type = 'sphinx_singlehtml'
128-
url = core_tags.make_document_url(proj, 'abc')
129-
self.assertEqual(url, self.pip_abc_fr_url)
130-
url = core_tags.make_document_url(proj, 'abc', '')
131-
self.assertEqual(url, self.pip_abc_fr_url)
132-
13367
def test_project_and_version_and_page(self):
13468
proj = Project.objects.get(slug='pip')
13569
url = core_tags.make_document_url(proj, 'abc', 'xyz')
13670
self.assertEqual(url, self.pip_abc_xyz_page_url)
137-
url = core_tags.make_document_url(proj, 'abc', 'index')
138-
self.assertEqual(url, self.pip_abc_url)
139-
140-
def test_project_and_version_and_page_htmldir(self):
141-
proj = Project.objects.get(slug='pip')
142-
proj.documentation_type = 'sphinx_htmldir'
143-
url = core_tags.make_document_url(proj, 'abc', 'xyz')
144-
self.assertEqual(url, self.pip_abc_xyz_dir_url)
145-
url = core_tags.make_document_url(proj, 'abc', 'index')
146-
self.assertEqual(url, self.pip_abc_url)
147-
148-
def test_project_and_version_and_page_signlehtml(self):
149-
proj = Project.objects.get(slug='pip')
150-
proj.documentation_type = 'sphinx_singlehtml'
151-
url = core_tags.make_document_url(proj, 'abc', 'xyz')
152-
self.assertEqual(url, self.pip_abc_xyz_document)
153-
url = core_tags.make_document_url(proj, 'abc', 'index')
154-
self.assertEqual(url, self.pip_abc_url)
71+
url = core_tags.make_document_url(proj, 'abc', 'index.html')
72+
self.assertEqual(url, self.pip_abc_url_index)
15573

15674
def test_translation_project_and_version_and_page(self):
15775
proj = Project.objects.get(slug='pip-fr')
15876
url = core_tags.make_document_url(proj, 'abc', 'xyz')
15977
self.assertEqual(url, self.pip_abc_xyz_fr_page_url)
160-
url = core_tags.make_document_url(proj, 'abc', 'index')
161-
self.assertEqual(url, self.pip_abc_fr_url)
162-
163-
def test_translation_project_and_version_and_page_htmldir(self):
164-
proj = Project.objects.get(slug='pip-fr')
165-
proj.documentation_type = 'sphinx_htmldir'
166-
url = core_tags.make_document_url(proj, 'abc', 'xyz')
167-
self.assertEqual(url, self.pip_abc_xyz_fr_dir_url)
168-
url = core_tags.make_document_url(proj, 'abc', 'index')
169-
self.assertEqual(url, self.pip_abc_fr_url)
170-
171-
def test_translation_project_and_version_and_page_singlehtml(self):
172-
proj = Project.objects.get(slug='pip-fr')
173-
proj.documentation_type = 'sphinx_singlehtml'
174-
url = core_tags.make_document_url(proj, 'abc', 'xyz')
175-
self.assertEqual(url, self.pip_abc_xyz_fr_document)
176-
url = core_tags.make_document_url(proj, 'abc', 'index')
177-
self.assertEqual(url, self.pip_abc_fr_url)
78+
url = core_tags.make_document_url(proj, 'abc', 'index.html')
79+
self.assertEqual(url, self.pip_abc_fr_url_index)
17880

17981
def test_mkdocs(self):
18082
proj = Project.objects.get(slug='pip')
@@ -188,17 +90,11 @@ def test_mkdocs_no_directory_urls(self):
18890
url = core_tags.make_document_url(proj, LATEST, 'document.html')
18991
self.assertEqual(url, self.pip_latest_document_page_url)
19092

191-
def test_mkdocs_index(self):
192-
proj = Project.objects.get(slug='pip')
193-
proj.documentation_type = 'mkdocs'
194-
url = core_tags.make_document_url(proj, LATEST, 'index')
195-
self.assertEqual(url, self.pip_latest_url)
196-
19793
def test_mkdocs_index_no_directory_urls(self):
19894
proj = Project.objects.get(slug='pip')
19995
proj.documentation_type = 'mkdocs'
20096
url = core_tags.make_document_url(proj, LATEST, 'index.html')
201-
self.assertEqual(url, self.pip_latest_url)
97+
self.assertEqual(url, self.pip_latest_url_index)
20298

20399
def test_restructured_text(self):
204100
value = '*test*'

‎readthedocs/rtd_tests/tests/test_redirects.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: utf-8 -*-
21
import logging
32

43
from django.http import Http404
@@ -169,7 +168,7 @@ def test_redirect_prefix_infinite(self):
169168
project=self.pip, redirect_type='prefix',
170169
from_url='/',
171170
)
172-
r = self.client.get('/redirect', HTTP_HOST='pip.readthedocs.org')
171+
r = self.client.get('/redirect.html', HTTP_HOST='pip.readthedocs.org')
173172
self.assertEqual(r.status_code, 302)
174173
self.assertEqual(
175174
r['Location'], 'http://pip.readthedocs.org/en/latest/redirect.html',
@@ -448,7 +447,7 @@ def test_http_filenames_return_themselves(self):
448447
def test_redirects_no_subdomain(self):
449448
self.assertEqual(
450449
self.redirect.get_full_path('index.html'),
451-
'/docs/read-the-docs/en/latest/',
450+
'/docs/read-the-docs/en/latest/index.html',
452451
)
453452

454453
@override_settings(

0 commit comments

Comments
 (0)