summaryrefslogtreecommitdiff
path: root/tests/admin_scripts
diff options
context:
space:
mode:
authorCarlton Gibson <carlton.gibson@noumenal.es>2022-10-18 10:30:35 -0700
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2022-10-20 13:38:31 -0700
commit5c2c7277d4554db34c585477b269bb1acfcbbe56 (patch)
tree7d1084d32f9618d57bb20fea3a9261b21627090c /tests/admin_scripts
parentd62563cbb194c420f242bfced52b37d6638e67c6 (diff)
downloaddjango-5c2c7277d4554db34c585477b269bb1acfcbbe56.tar.gz
Fixed #34085 -- Made management commands don't use black for non-Python files.
Bug in d113b5a837f726d1c638d76c4e88445e6cd59fd5. Co-authored-by: programmylife <acmshar@gmail.com> Co-authored-by: Carlton Gibson <carlton.gibson@noumenal.es>
Diffstat (limited to 'tests/admin_scripts')
-rw-r--r--tests/admin_scripts/custom_templates/project_template/additional_dir/requirements.in5
-rw-r--r--tests/admin_scripts/tests.py17
2 files changed, 22 insertions, 0 deletions
diff --git a/tests/admin_scripts/custom_templates/project_template/additional_dir/requirements.in b/tests/admin_scripts/custom_templates/project_template/additional_dir/requirements.in
new file mode 100644
index 0000000000..77e66e2c93
--- /dev/null
+++ b/tests/admin_scripts/custom_templates/project_template/additional_dir/requirements.in
@@ -0,0 +1,5 @@
+# Should not be processed by `black`.
+Django<4.2
+environs[django]
+psycopg2-binary
+django-extensions
diff --git a/tests/admin_scripts/tests.py b/tests/admin_scripts/tests.py
index 0a44e8a538..4149a31e21 100644
--- a/tests/admin_scripts/tests.py
+++ b/tests/admin_scripts/tests.py
@@ -2483,6 +2483,23 @@ class StartProject(LiveServerTestCase, AdminScriptTestCase):
self.assertTrue(os.path.isdir(testproject_dir))
self.assertTrue(os.path.exists(os.path.join(testproject_dir, "additional_dir")))
+ def test_custom_project_template_non_python_files_not_formatted(self):
+ template_path = os.path.join(custom_templates_dir, "project_template")
+ args = ["startproject", "--template", template_path, "customtestproject"]
+ testproject_dir = os.path.join(self.test_dir, "customtestproject")
+
+ _, err = self.run_django_admin(args)
+ self.assertNoOutput(err)
+ with open(
+ os.path.join(template_path, "additional_dir", "requirements.in")
+ ) as f:
+ expected = f.read()
+ with open(
+ os.path.join(testproject_dir, "additional_dir", "requirements.in")
+ ) as f:
+ result = f.read()
+ self.assertEqual(expected, result)
+
def test_template_dir_with_trailing_slash(self):
"Ticket 17475: Template dir passed has a trailing path separator"
template_path = os.path.join(custom_templates_dir, "project_template" + os.sep)