mirror of
				https://github.com/django/django.git
				synced 2025-10-31 09:41:08 +00:00 
			
		
		
		
	[1.7.x] Fixed #23374 -- Renamed StaticLiveServerCase to StaticLiveServerTestCase
Refs #20739. Thanks Raphaël Hertzog for the report and the initial
patch.
Backport of 3a44e2000 from master.
			
			
This commit is contained in:
		| @@ -1,12 +1,12 @@ | ||||
| import os | ||||
| from unittest import SkipTest | ||||
|  | ||||
| from django.contrib.staticfiles.testing import StaticLiveServerCase | ||||
| from django.contrib.staticfiles.testing import StaticLiveServerTestCase | ||||
| from django.utils.module_loading import import_string | ||||
| from django.utils.translation import ugettext as _ | ||||
|  | ||||
|  | ||||
| class AdminSeleniumWebDriverTestCase(StaticLiveServerCase): | ||||
| class AdminSeleniumWebDriverTestCase(StaticLiveServerTestCase): | ||||
|  | ||||
|     available_apps = [ | ||||
|         'django.contrib.admin', | ||||
|   | ||||
| @@ -3,7 +3,7 @@ from django.test import LiveServerTestCase | ||||
| from django.contrib.staticfiles.handlers import StaticFilesHandler | ||||
|  | ||||
|  | ||||
| class StaticLiveServerCase(LiveServerTestCase): | ||||
| class StaticLiveServerTestCase(LiveServerTestCase): | ||||
|     """ | ||||
|     Extends django.test.LiveServerTestCase to transparently overlay at test | ||||
|     execution-time the assets provided by the staticfiles app finders. This | ||||
|   | ||||
| @@ -152,7 +152,7 @@ file-serving functionality: It doesn't know about the finders feature of the | ||||
| collected under :setting:`STATIC_ROOT`. | ||||
|  | ||||
| Because of this, ``staticfiles`` ships its own | ||||
| :class:`django.contrib.staticfiles.testing.StaticLiveServerCase`, a subclass | ||||
| :class:`django.contrib.staticfiles.testing.StaticLiveServerTestCase`, a subclass | ||||
| of the built-in one that has the ability to transparently serve all the assets | ||||
| during execution of these tests in a way very similar to what we get at | ||||
| development time with ``DEBUG = True``, i.e. without having to collect them | ||||
| @@ -160,8 +160,8 @@ using :djadmin:`collectstatic` first. | ||||
|  | ||||
| .. versionadded:: 1.7 | ||||
|  | ||||
|     :class:`django.contrib.staticfiles.testing.StaticLiveServerCase` is new in | ||||
|     Django 1.7. Previously its functionality was provided by | ||||
|     :class:`django.contrib.staticfiles.testing.StaticLiveServerTestCase` is new | ||||
|     in Django 1.7. Previously its functionality was provided by | ||||
|     :class:`django.test.LiveServerTestCase`. | ||||
|  | ||||
| Deployment | ||||
|   | ||||
| @@ -487,7 +487,7 @@ files in app directories. | ||||
| Specialized test case to support 'live testing' | ||||
| ----------------------------------------------- | ||||
|  | ||||
| .. class:: testing.StaticLiveServerCase | ||||
| .. class:: testing.StaticLiveServerTestCase | ||||
|  | ||||
| This unittest TestCase subclass extends :class:`django.test.LiveServerTestCase`. | ||||
|  | ||||
| @@ -504,5 +504,5 @@ transparently overlay at test execution-time the assets provided by the | ||||
|  | ||||
| .. versionadded:: 1.7 | ||||
|  | ||||
|     ``StaticLiveServerCase`` is new in Django 1.7. Previously its functionality | ||||
|     was provided by :class:`django.test.LiveServerTestCase`. | ||||
|     ``StaticLiveServerTestCase`` is new in Django 1.7. Previously its | ||||
|     functionality was provided by :class:`django.test.LiveServerTestCase`. | ||||
|   | ||||
| @@ -1341,7 +1341,7 @@ Miscellaneous | ||||
|   (similarly to what one gets with :setting:`DEBUG = True <DEBUG>` at | ||||
|   development-time) has been moved to a new class that lives in the | ||||
|   ``staticfiles`` application (the one actually in charge of such feature): | ||||
|   :class:`django.contrib.staticfiles.testing.StaticLiveServerCase`. In other | ||||
|   :class:`django.contrib.staticfiles.testing.StaticLiveServerTestCase`. In other | ||||
|   words, ``LiveServerTestCase`` itself is less powerful but at the same time | ||||
|   has less magic. | ||||
|  | ||||
|   | ||||
| @@ -773,9 +773,9 @@ out the `full reference`_ for more details. | ||||
|  | ||||
|     If you use the ``staticfiles`` app in your project and need to perform live | ||||
|     testing then you might want to consider using the | ||||
|     :class:`~django.contrib.staticfiles.testing.StaticLiveServerCase` subclass | ||||
|     shipped with it instead because it's the one that implements the original | ||||
|     behavior now. See :ref:`the relevant documentation | ||||
|     :class:`~django.contrib.staticfiles.testing.StaticLiveServerTestCase` | ||||
|     subclass shipped with it instead because it's the one that implements the | ||||
|     original behavior now. See :ref:`the relevant documentation | ||||
|     <staticfiles-testing-support>` for more details. | ||||
|  | ||||
| .. note:: | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| """ | ||||
| A subset of the tests in tests/servers/tests exercicing | ||||
| django.contrib.staticfiles.testing.StaticLiveServerCase instead of | ||||
| django.contrib.staticfiles.testing.StaticLiveServerTestCase instead of | ||||
| django.test.LiveServerTestCase. | ||||
| """ | ||||
|  | ||||
| @@ -11,7 +11,7 @@ from django.test import override_settings | ||||
| from django.utils.six.moves.urllib.request import urlopen | ||||
| from django.utils._os import upath | ||||
|  | ||||
| from django.contrib.staticfiles.testing import StaticLiveServerCase | ||||
| from django.contrib.staticfiles.testing import StaticLiveServerTestCase | ||||
|  | ||||
|  | ||||
| TEST_ROOT = os.path.dirname(upath(__file__)) | ||||
| @@ -23,7 +23,7 @@ TEST_SETTINGS = { | ||||
| } | ||||
|  | ||||
|  | ||||
| class LiveServerBase(StaticLiveServerCase): | ||||
| class LiveServerBase(StaticLiveServerTestCase): | ||||
|  | ||||
|     available_apps = [] | ||||
|  | ||||
| @@ -94,8 +94,8 @@ class StaticLiveServerView(LiveServerBase): | ||||
|  | ||||
|     def test_collectstatic_emulation(self): | ||||
|         """ | ||||
|         Test that StaticLiveServerCase use of staticfiles' serve() allows it to | ||||
|         discover app's static assets without having to collectstatic first. | ||||
|         Test that StaticLiveServerTestCase use of staticfiles' serve() allows it | ||||
|         to discover app's static assets without having to collectstatic first. | ||||
|         """ | ||||
|         f = self.urlopen('/static/test/file.txt') | ||||
|         self.assertEqual(f.read().rstrip(b'\r\n'), b'In app media directory.') | ||||
|   | ||||
		Reference in New Issue
	
	Block a user