Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Fixed #18408 -- Flatpages tests expect example.com for site 1 #83

Closed
wants to merge 1 commit into from

2 participants

Jens Page Claude Paroz
Jens Page

Resolves a couple of issues with running Flatpages tests by...

  • Creating an example_site fixture
  • Overriding project SITE_ID setting to 1
  • Normalizing the use of the hardcoded (1) site_id to settings.SITE_ID
Jens Page datajockey Resolves Flatpages test issues by
- Creating an example_site fixture
- Overriding project SITE_ID setting to 1
- Normalizing the use of the hardcoded (1) site_id to settings.SITE_ID

Conflicts:

	AUTHORS
	django/contrib/flatpages/tests/csrf.py
	django/contrib/flatpages/tests/middleware.py
	django/contrib/flatpages/tests/templatetags.py
	django/contrib/flatpages/tests/views.py
2cc80be
Claude Paroz
Collaborator

Many thanks, pushed in ba10be7.
Hope you don't mind I just added a line to your patch (so as a test comparison is made against a translated error message).

Claude Paroz claudep closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on May 20, 2012
  1. Jens Page

    Resolves Flatpages test issues by

    datajockey authored
    - Creating an example_site fixture
    - Overriding project SITE_ID setting to 1
    - Normalizing the use of the hardcoded (1) site_id to settings.SITE_ID
    
    Conflicts:
    
    	AUTHORS
    	django/contrib/flatpages/tests/csrf.py
    	django/contrib/flatpages/tests/middleware.py
    	django/contrib/flatpages/tests/templatetags.py
    	django/contrib/flatpages/tests/views.py
This page is out of date. Refresh to see the latest.
1  AUTHORS
View
@@ -566,6 +566,7 @@ answer newbie questions, and generally made Django that much better:
Gasper Zejn <zejn@kiberpipa.org>
Jarek Zgoda <jarek.zgoda@gmail.com>
Cheng Zhang
+ Jens Page
A big THANK YOU goes to:
11 django/contrib/flatpages/fixtures/example_site.json
View
@@ -0,0 +1,11 @@
+[
+ {
+ "pk": 1,
+ "model": "sites.site",
+ "fields": {
+ "domain": "example.com",
+ "name": "example.com"
+ }
+ }
+]
+
3  django/contrib/flatpages/tests/csrf.py
View
@@ -18,9 +18,10 @@
TEMPLATE_DIRS=(
os.path.join(os.path.dirname(__file__), 'templates'),
),
+ SITE_ID=1,
)
class FlatpageCSRFTests(TestCase):
- fixtures = ['sample_flatpages']
+ fixtures = ['sample_flatpages', 'example_site']
urls = 'django.contrib.flatpages.tests.urls'
def setUp(self):
3  django/contrib/flatpages/tests/forms.py
View
@@ -5,7 +5,10 @@
from django.test.utils import override_settings
from django.utils import translation
+@override_settings(SITE_ID=1)
class FlatpageAdminFormTests(TestCase):
+ fixtures = ['example_site']
+
def setUp(self):
self.form_data = {
'title': "A test page",
12 django/contrib/flatpages/tests/middleware.py
View
@@ -19,9 +19,10 @@
TEMPLATE_DIRS=(
os.path.join(os.path.dirname(__file__), 'templates'),
),
+ SITE_ID=1,
)
class FlatpageMiddlewareTests(TestCase):
- fixtures = ['sample_flatpages']
+ fixtures = ['sample_flatpages', 'example_site']
urls = 'django.contrib.flatpages.tests.urls'
def test_view_flatpage(self):
@@ -75,7 +76,7 @@ def test_fallback_flatpage_special_chars(self):
enable_comments=False,
registration_required=False,
)
- fp.sites.add(1)
+ fp.sites.add(settings.SITE_ID)
response = self.client.get('/some.very_special~chars-here/')
self.assertEqual(response.status_code, 200)
@@ -96,9 +97,10 @@ def test_fallback_flatpage_special_chars(self):
TEMPLATE_DIRS=(
os.path.join(os.path.dirname(__file__), 'templates'),
),
+ SITE_ID=1,
)
class FlatpageMiddlewareAppendSlashTests(TestCase):
- fixtures = ['sample_flatpages']
+ fixtures = ['sample_flatpages', 'example_site']
urls = 'django.contrib.flatpages.tests.urls'
def test_redirect_view_flatpage(self):
@@ -130,7 +132,7 @@ def test_redirect_fallback_flatpage_special_chars(self):
enable_comments=False,
registration_required=False,
)
- fp.sites.add(1)
+ fp.sites.add(settings.SITE_ID)
response = self.client.get('/some.very_special~chars-here')
self.assertRedirects(response, '/some.very_special~chars-here/', status_code=301)
@@ -144,7 +146,7 @@ def test_redirect_fallback_flatpage_root(self):
enable_comments=False,
registration_required=False,
)
- fp.sites.add(1)
+ fp.sites.add(settings.SITE_ID)
response = self.client.get('/')
self.assertEqual(response.status_code, 200)
1  django/contrib/flatpages/tests/templatetags.py
View
@@ -18,6 +18,7 @@
TEMPLATE_DIRS=(
os.path.join(os.path.dirname(__file__), 'templates'),
),
+ SITE_ID=1,
)
class FlatpageTemplateTagTests(TestCase):
fixtures = ['sample_flatpages']
8 django/contrib/flatpages/tests/views.py
View
@@ -19,9 +19,10 @@
TEMPLATE_DIRS=(
os.path.join(os.path.dirname(__file__), 'templates'),
),
+ SITE_ID=1,
)
class FlatpageViewTests(TestCase):
- fixtures = ['sample_flatpages']
+ fixtures = ['sample_flatpages', 'example_site']
urls = 'django.contrib.flatpages.tests.urls'
def test_view_flatpage(self):
@@ -85,9 +86,10 @@ def test_view_flatpage_special_chars(self):
TEMPLATE_DIRS=(
os.path.join(os.path.dirname(__file__), 'templates'),
),
+ SITE_ID=1,
)
class FlatpageViewAppendSlashTests(TestCase):
- fixtures = ['sample_flatpages']
+ fixtures = ['sample_flatpages', 'example_site']
urls = 'django.contrib.flatpages.tests.urls'
def test_redirect_view_flatpage(self):
@@ -119,7 +121,7 @@ def test_redirect_view_flatpage_special_chars(self):
enable_comments=False,
registration_required=False,
)
- fp.sites.add(1)
+ fp.sites.add(settings.SITE_ID)
response = self.client.get('/flatpage_root/some.very_special~chars-here')
self.assertRedirects(response, '/flatpage_root/some.very_special~chars-here/', status_code=301)
Something went wrong with that request. Please try again.