From 986a590eecd15ea67caf97a3bb04b5d3a9268c3d Mon Sep 17 00:00:00 2001
From: dzhuang <dzhuang.scut@gmail.com>
Date: Fri, 12 Jan 2018 11:07:51 +0800
Subject: [PATCH] Correct template overriding literals in example settings.
Remove unnecessary testing resource files.
---
local_settings.example.py | 7 +++---
tests/resources/my_staticfiles/css/my_css.css | 1 -
.../my_templates/templates/base.html | 2 --
.../my_templates/templates/course/home.html | 6 -----
tests/test_checks.py | 22 ++++++++++++++-----
5 files changed, 19 insertions(+), 19 deletions(-)
delete mode 100644 tests/resources/my_staticfiles/css/my_css.css
delete mode 100644 tests/resources/my_templates/templates/base.html
delete mode 100644 tests/resources/my_templates/templates/course/home.html
diff --git a/local_settings.example.py b/local_settings.example.py
index 901f075d..854a0913 100644
--- a/local_settings.example.py
+++ b/local_settings.example.py
@@ -278,10 +278,9 @@ RELATE_SHOW_EDITOR_FORM = True
# my_templates/
# base.html
# ...
-# templates/
-# course/
-# course_base.html
-# sign-in-email.txt
+# course/
+# course_base.html
+# sign-in-email.txt
# ...
#
diff --git a/tests/resources/my_staticfiles/css/my_css.css b/tests/resources/my_staticfiles/css/my_css.css
deleted file mode 100644
index fb7fb2bd..00000000
--- a/tests/resources/my_staticfiles/css/my_css.css
+++ /dev/null
@@ -1 +0,0 @@
-# nothing
\ No newline at end of file
diff --git a/tests/resources/my_templates/templates/base.html b/tests/resources/my_templates/templates/base.html
deleted file mode 100644
index bfff6f0f..00000000
--- a/tests/resources/my_templates/templates/base.html
+++ /dev/null
@@ -1,2 +0,0 @@
-{% extends "base.html" %}
-{% block footer %}This is my footer{% endblock %}
diff --git a/tests/resources/my_templates/templates/course/home.html b/tests/resources/my_templates/templates/course/home.html
deleted file mode 100644
index 834133ca..00000000
--- a/tests/resources/my_templates/templates/course/home.html
+++ /dev/null
@@ -1,6 +0,0 @@
-{% extends "course/home.html" %}
-{% load i18n %}
- {% block cover %}
- {{ block.super }}
- Hello!
- {% endblock %}
diff --git a/tests/test_checks.py b/tests/test_checks.py
index d68c0f08..57ca4370 100644
--- a/tests/test_checks.py
+++ b/tests/test_checks.py
@@ -636,8 +636,14 @@ class CheckRelateSiteName(CheckRelateSettingsBase):
self.assertCheckMessages(["relate_site_name.E004"])
-TEST_MY_OVERRIDING_TEMPLATES_DIR = os.path.join(os.path.dirname(__file__),
- "resources", "my_templates")
+TEST_MY_OVERRIDING_TEMPLATES_DIR = "/path/to/my_template/"
+
+
+def is_dir_side_effect(*args, **kwargs):
+ if TEST_MY_OVERRIDING_TEMPLATES_DIR in args:
+ return True
+ else:
+ return False
class CheckRelateTemplatesDirs(CheckRelateSettingsBase):
@@ -652,7 +658,9 @@ class CheckRelateTemplatesDirs(CheckRelateSettingsBase):
def test_valid_conf(self):
with override_settings(RELATE_OVERRIDE_TEMPLATES_DIRS=self.VALID_CONF):
- self.assertCheckMessages([])
+ with mock.patch("relate.checks.os.path.isdir",
+ side_effect=is_dir_side_effect):
+ self.assertCheckMessages([])
def test_not_configured(self):
with override_settings():
@@ -673,6 +681,8 @@ class CheckRelateTemplatesDirs(CheckRelateSettingsBase):
def test_invalid_path(self):
with override_settings(RELATE_OVERRIDE_TEMPLATES_DIRS=self.INVALID_CONF3):
- self.assertCheckMessages(
- ["relate_override_templates_dirs.W001",
- "relate_override_templates_dirs.W001"])
+ with mock.patch("relate.checks.os.path.isdir",
+ side_effect=is_dir_side_effect):
+ self.assertCheckMessages(
+ ["relate_override_templates_dirs.W001",
+ "relate_override_templates_dirs.W001"])
--
GitLab