summaryrefslogtreecommitdiff
path: root/tests/regressiontests/staticfiles_tests/apps
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2010-10-20 01:33:24 +0000
committerJannis Leidel <jannis@leidel.info>2010-10-20 01:33:24 +0000
commitcfc19f84def07fb950ae8789ed0655eae4f66a92 (patch)
tree2c02cc5996a28f0ab900def5d804c961753c86d0 /tests/regressiontests/staticfiles_tests/apps
parenta014ee02888d2fcea6880bef51f143632a60aab3 (diff)
Fixed #12323 and #11582 -- Extended the ability to handle static files. Thanks to all for helping with the original app, the patch, documentation and general support.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14293 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/regressiontests/staticfiles_tests/apps')
-rw-r--r--tests/regressiontests/staticfiles_tests/apps/__init__.py0
-rw-r--r--tests/regressiontests/staticfiles_tests/apps/no_label/__init__.py0
-rw-r--r--tests/regressiontests/staticfiles_tests/apps/no_label/models.py0
-rw-r--r--tests/regressiontests/staticfiles_tests/apps/no_label/static/file2.txt1
-rw-r--r--tests/regressiontests/staticfiles_tests/apps/test/__init__.py0
-rw-r--r--tests/regressiontests/staticfiles_tests/apps/test/models.py0
-rw-r--r--tests/regressiontests/staticfiles_tests/apps/test/otherdir/odfile.txt1
-rw-r--r--tests/regressiontests/staticfiles_tests/apps/test/static/test/.hidden1
-rw-r--r--tests/regressiontests/staticfiles_tests/apps/test/static/test/CVS1
-rw-r--r--tests/regressiontests/staticfiles_tests/apps/test/static/test/backup~1
-rw-r--r--tests/regressiontests/staticfiles_tests/apps/test/static/test/file.txt1
-rw-r--r--tests/regressiontests/staticfiles_tests/apps/test/static/test/file1.txt1
-rw-r--r--tests/regressiontests/staticfiles_tests/apps/test/static/test/test.ignoreme1
13 files changed, 8 insertions, 0 deletions
diff --git a/tests/regressiontests/staticfiles_tests/apps/__init__.py b/tests/regressiontests/staticfiles_tests/apps/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/regressiontests/staticfiles_tests/apps/__init__.py
diff --git a/tests/regressiontests/staticfiles_tests/apps/no_label/__init__.py b/tests/regressiontests/staticfiles_tests/apps/no_label/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/regressiontests/staticfiles_tests/apps/no_label/__init__.py
diff --git a/tests/regressiontests/staticfiles_tests/apps/no_label/models.py b/tests/regressiontests/staticfiles_tests/apps/no_label/models.py
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/regressiontests/staticfiles_tests/apps/no_label/models.py
diff --git a/tests/regressiontests/staticfiles_tests/apps/no_label/static/file2.txt b/tests/regressiontests/staticfiles_tests/apps/no_label/static/file2.txt
new file mode 100644
index 0000000000..aa264cab9b
--- /dev/null
+++ b/tests/regressiontests/staticfiles_tests/apps/no_label/static/file2.txt
@@ -0,0 +1 @@
+file2 in no_label_app
diff --git a/tests/regressiontests/staticfiles_tests/apps/test/__init__.py b/tests/regressiontests/staticfiles_tests/apps/test/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/regressiontests/staticfiles_tests/apps/test/__init__.py
diff --git a/tests/regressiontests/staticfiles_tests/apps/test/models.py b/tests/regressiontests/staticfiles_tests/apps/test/models.py
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/regressiontests/staticfiles_tests/apps/test/models.py
diff --git a/tests/regressiontests/staticfiles_tests/apps/test/otherdir/odfile.txt b/tests/regressiontests/staticfiles_tests/apps/test/otherdir/odfile.txt
new file mode 100644
index 0000000000..c62c93d162
--- /dev/null
+++ b/tests/regressiontests/staticfiles_tests/apps/test/otherdir/odfile.txt
@@ -0,0 +1 @@
+File in otherdir.
diff --git a/tests/regressiontests/staticfiles_tests/apps/test/static/test/.hidden b/tests/regressiontests/staticfiles_tests/apps/test/static/test/.hidden
new file mode 100644
index 0000000000..cef6c23575
--- /dev/null
+++ b/tests/regressiontests/staticfiles_tests/apps/test/static/test/.hidden
@@ -0,0 +1 @@
+This file should be ignored.
diff --git a/tests/regressiontests/staticfiles_tests/apps/test/static/test/CVS b/tests/regressiontests/staticfiles_tests/apps/test/static/test/CVS
new file mode 100644
index 0000000000..cef6c23575
--- /dev/null
+++ b/tests/regressiontests/staticfiles_tests/apps/test/static/test/CVS
@@ -0,0 +1 @@
+This file should be ignored.
diff --git a/tests/regressiontests/staticfiles_tests/apps/test/static/test/backup~ b/tests/regressiontests/staticfiles_tests/apps/test/static/test/backup~
new file mode 100644
index 0000000000..cef6c23575
--- /dev/null
+++ b/tests/regressiontests/staticfiles_tests/apps/test/static/test/backup~
@@ -0,0 +1 @@
+This file should be ignored.
diff --git a/tests/regressiontests/staticfiles_tests/apps/test/static/test/file.txt b/tests/regressiontests/staticfiles_tests/apps/test/static/test/file.txt
new file mode 100644
index 0000000000..169a206488
--- /dev/null
+++ b/tests/regressiontests/staticfiles_tests/apps/test/static/test/file.txt
@@ -0,0 +1 @@
+In app media directory.
diff --git a/tests/regressiontests/staticfiles_tests/apps/test/static/test/file1.txt b/tests/regressiontests/staticfiles_tests/apps/test/static/test/file1.txt
new file mode 100644
index 0000000000..9f9a8d92ab
--- /dev/null
+++ b/tests/regressiontests/staticfiles_tests/apps/test/static/test/file1.txt
@@ -0,0 +1 @@
+file1 in the app dir \ No newline at end of file
diff --git a/tests/regressiontests/staticfiles_tests/apps/test/static/test/test.ignoreme b/tests/regressiontests/staticfiles_tests/apps/test/static/test/test.ignoreme
new file mode 100644
index 0000000000..d7df09c191
--- /dev/null
+++ b/tests/regressiontests/staticfiles_tests/apps/test/static/test/test.ignoreme
@@ -0,0 +1 @@
+This file should be ignored. \ No newline at end of file