Commit 3a44e200 authored by Claude Paroz's avatar Claude Paroz
Browse files

Fixed #23374 -- Renamed StaticLiveServerCase to StaticLiveServerTestCase

Refs #20739. Thanks Raphaël Hertzog for the report and the initial
patch.
parent 3cbb7590
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
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',
+1 −1
Original line number Diff line number Diff line
@@ -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
+3 −3
Original line number Diff line number Diff line
@@ -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
+3 −3
Original line number Diff line number Diff line
@@ -488,7 +488,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`.

@@ -505,5 +505,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`.
+1 −1
Original line number Diff line number Diff line
@@ -1339,7 +1339,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.

Loading