summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Holtermann <info@markusholtermann.eu>2021-02-05 18:41:49 +0100
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2021-02-06 13:41:35 +0100
commit50a5f8840fa564dcefdb1fa5c58f06fcd472ee70 (patch)
tree7a5bce946fceb84a0173478364d76275a7359e2b
parent9d05add447d57d94ec9e9b3daa338d85a29fe083 (diff)
Refs #32394 -- Changed STATIC_URL/MEDIA_URL to relative paths in tests and docs where appropriate.
-rw-r--r--docs/howto/static-files/index.txt12
-rw-r--r--docs/ref/settings.txt4
-rw-r--r--docs/ref/views.txt2
-rw-r--r--tests/asgi/tests.py2
-rwxr-xr-xtests/runtests.py2
-rw-r--r--tests/servers/tests.py4
-rw-r--r--tests/staticfiles_tests/settings.py4
-rw-r--r--tests/staticfiles_tests/test_liveserver.py4
-rw-r--r--tests/staticfiles_tests/test_utils.py2
-rw-r--r--tests/template_tests/syntax_tests/test_static.py2
-rw-r--r--tests/view_tests/tests/test_static.py2
11 files changed, 20 insertions, 20 deletions
diff --git a/docs/howto/static-files/index.txt b/docs/howto/static-files/index.txt
index 0a0e7bedd0..b90cc42cd6 100644
--- a/docs/howto/static-files/index.txt
+++ b/docs/howto/static-files/index.txt
@@ -16,7 +16,7 @@ Configuring static files
#. In your settings file, define :setting:`STATIC_URL`, for example::
- STATIC_URL = '/static/'
+ STATIC_URL = 'static/'
#. In your templates, use the :ttag:`static` template tag to build the URL for
the given relative path using the configured :setting:`STATICFILES_STORAGE`.
@@ -88,8 +88,8 @@ to ``True``. If you don't have ``django.contrib.staticfiles`` in
This is not suitable for production use! For some common deployment
strategies, see :doc:`/howto/static-files/deployment`.
-For example, if your :setting:`STATIC_URL` is defined as ``/static/``, you can do
-this by adding the following snippet to your urls.py::
+For example, if your :setting:`STATIC_URL` is defined as ``static/``, you can
+do this by adding the following snippet to your urls.py::
from django.conf import settings
from django.conf.urls.static import static
@@ -101,7 +101,7 @@ this by adding the following snippet to your urls.py::
.. note::
This helper function works only in debug mode and only if
- the given prefix is local (e.g. ``/static/``) and not a URL (e.g.
+ the given prefix is local (e.g. ``static/``) and not a URL (e.g.
``http://static.example.com/``).
Also this helper function only serves the actual :setting:`STATIC_ROOT`
@@ -119,7 +119,7 @@ During development, you can serve user-uploaded media files from
This is not suitable for production use! For some common deployment
strategies, see :doc:`/howto/static-files/deployment`.
-For example, if your :setting:`MEDIA_URL` is defined as ``/media/``, you can do
+For example, if your :setting:`MEDIA_URL` is defined as ``media/``, you can do
this by adding the following snippet to your :setting:`ROOT_URLCONF`::
from django.conf import settings
@@ -132,7 +132,7 @@ this by adding the following snippet to your :setting:`ROOT_URLCONF`::
.. note::
This helper function works only in debug mode and only if
- the given prefix is local (e.g. ``/media/``) and not a URL (e.g.
+ the given prefix is local (e.g. ``media/``) and not a URL (e.g.
``http://media.example.com/``).
.. _staticfiles-testing-support:
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 09eeb1e52f..3f18af978d 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -3343,7 +3343,7 @@ Default: ``None``
URL to use when referring to static files located in :setting:`STATIC_ROOT`.
-Example: ``"/static/"`` or ``"http://static.example.com/"``
+Example: ``"static/"`` or ``"http://static.example.com/"``
If not ``None``, this will be used as the base path for
:ref:`asset definitions<form-asset-paths>` (the ``Media`` class) and the
@@ -3400,7 +3400,7 @@ tuples, e.g.::
("downloads", "/opt/webfiles/stats"),
]
-For example, assuming you have :setting:`STATIC_URL` set to ``'/static/'``, the
+For example, assuming you have :setting:`STATIC_URL` set to ``'static/'``, the
:djadmin:`collectstatic` management command would collect the "stats" files
in a ``'downloads'`` subdirectory of :setting:`STATIC_ROOT`.
diff --git a/docs/ref/views.txt b/docs/ref/views.txt
index 6aff0e3877..7ee6cc806f 100644
--- a/docs/ref/views.txt
+++ b/docs/ref/views.txt
@@ -39,7 +39,7 @@ built-in handling for user-uploaded files, but you can have Django serve your
]
Note, the snippet assumes your :setting:`MEDIA_URL` has a value of
-``'/media/'``. This will call the :func:`~django.views.static.serve` view,
+``'media/'``. This will call the :func:`~django.views.static.serve` view,
passing in the path from the URLconf and the (required) ``document_root``
parameter.
diff --git a/tests/asgi/tests.py b/tests/asgi/tests.py
index 68e242faa7..3509bb0aa7 100644
--- a/tests/asgi/tests.py
+++ b/tests/asgi/tests.py
@@ -97,7 +97,7 @@ class ASGITest(SimpleTestCase):
@modify_settings(INSTALLED_APPS={'append': 'django.contrib.staticfiles'})
@override_settings(
- STATIC_URL='/static/',
+ STATIC_URL='static/',
STATIC_ROOT=TEST_STATIC_ROOT,
STATICFILES_DIRS=[TEST_STATIC_ROOT],
STATICFILES_FINDERS=[
diff --git a/tests/runtests.py b/tests/runtests.py
index 870711370d..4cd16809c4 100755
--- a/tests/runtests.py
+++ b/tests/runtests.py
@@ -159,7 +159,7 @@ def setup(verbosity, test_labels, parallel, start_at, start_after):
# Redirect some settings for the duration of these tests.
settings.INSTALLED_APPS = ALWAYS_INSTALLED_APPS
settings.ROOT_URLCONF = 'urls'
- settings.STATIC_URL = '/static/'
+ settings.STATIC_URL = 'static/'
settings.STATIC_ROOT = os.path.join(TMPDIR, 'static')
settings.TEMPLATES = [{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
diff --git a/tests/servers/tests.py b/tests/servers/tests.py
index a586b82aeb..8183d5dbf5 100644
--- a/tests/servers/tests.py
+++ b/tests/servers/tests.py
@@ -17,9 +17,9 @@ from .models import Person
TEST_ROOT = os.path.dirname(__file__)
TEST_SETTINGS = {
- 'MEDIA_URL': '/media/',
+ 'MEDIA_URL': 'media/',
'MEDIA_ROOT': os.path.join(TEST_ROOT, 'media'),
- 'STATIC_URL': '/static/',
+ 'STATIC_URL': 'static/',
'STATIC_ROOT': os.path.join(TEST_ROOT, 'static'),
}
diff --git a/tests/staticfiles_tests/settings.py b/tests/staticfiles_tests/settings.py
index 444450358f..3bd581824d 100644
--- a/tests/staticfiles_tests/settings.py
+++ b/tests/staticfiles_tests/settings.py
@@ -4,8 +4,8 @@ from pathlib import Path
TEST_ROOT = os.path.dirname(__file__)
TEST_SETTINGS = {
- 'MEDIA_URL': '/media/',
- 'STATIC_URL': '/static/',
+ 'MEDIA_URL': 'media/',
+ 'STATIC_URL': 'static/',
'MEDIA_ROOT': os.path.join(TEST_ROOT, 'project', 'site_media', 'media'),
'STATIC_ROOT': os.path.join(TEST_ROOT, 'project', 'site_media', 'static'),
'STATICFILES_DIRS': [
diff --git a/tests/staticfiles_tests/test_liveserver.py b/tests/staticfiles_tests/test_liveserver.py
index 820fa5bc89..eb027f7341 100644
--- a/tests/staticfiles_tests/test_liveserver.py
+++ b/tests/staticfiles_tests/test_liveserver.py
@@ -13,8 +13,8 @@ from django.test import modify_settings, override_settings
TEST_ROOT = os.path.dirname(__file__)
TEST_SETTINGS = {
- 'MEDIA_URL': '/media/',
- 'STATIC_URL': '/static/',
+ 'MEDIA_URL': 'media/',
+ 'STATIC_URL': 'static/',
'MEDIA_ROOT': os.path.join(TEST_ROOT, 'project', 'site_media', 'media'),
'STATIC_ROOT': os.path.join(TEST_ROOT, 'project', 'site_media', 'static'),
}
diff --git a/tests/staticfiles_tests/test_utils.py b/tests/staticfiles_tests/test_utils.py
index 4610b7f00f..2fe7344646 100644
--- a/tests/staticfiles_tests/test_utils.py
+++ b/tests/staticfiles_tests/test_utils.py
@@ -5,7 +5,7 @@ from django.test import SimpleTestCase, override_settings
class CheckSettingsTests(SimpleTestCase):
- @override_settings(DEBUG=True, MEDIA_URL='/static/media/', STATIC_URL='/static/',)
+ @override_settings(DEBUG=True, MEDIA_URL='static/media/', STATIC_URL='static/')
def test_media_url_in_static_url(self):
msg = "runserver can't serve media if MEDIA_URL is within STATIC_URL."
with self.assertRaisesMessage(ImproperlyConfigured, msg):
diff --git a/tests/template_tests/syntax_tests/test_static.py b/tests/template_tests/syntax_tests/test_static.py
index 00f8cdbc11..6f4908ac2c 100644
--- a/tests/template_tests/syntax_tests/test_static.py
+++ b/tests/template_tests/syntax_tests/test_static.py
@@ -7,7 +7,7 @@ from django.test import SimpleTestCase, override_settings
from ..utils import setup
-@override_settings(INSTALLED_APPS=[], MEDIA_URL='/media/', STATIC_URL='/static/')
+@override_settings(INSTALLED_APPS=[], MEDIA_URL='media/', STATIC_URL='static/')
class StaticTagTests(SimpleTestCase):
libraries = {'static': 'django.templatetags.static'}
diff --git a/tests/view_tests/tests/test_static.py b/tests/view_tests/tests/test_static.py
index 5044aca2d6..a5e811e5d6 100644
--- a/tests/view_tests/tests/test_static.py
+++ b/tests/view_tests/tests/test_static.py
@@ -142,7 +142,7 @@ class StaticHelperTest(StaticTests):
def setUp(self):
super().setUp()
self._old_views_urlpatterns = urls.urlpatterns[:]
- urls.urlpatterns += static('/media/', document_root=media_dir)
+ urls.urlpatterns += static('media/', document_root=media_dir)
def tearDown(self):
super().tearDown()