1 files changed, 29 insertions, 0 deletions
diff --git a/tests/regressiontests/admin_scripts/tests.py b/tests/regressiontests/admin_scripts/tests.py
index 74fb20f892..669c6e8258 100644
--- a/tests/regressiontests/admin_scripts/tests.py
+++ b/tests/regressiontests/admin_scripts/tests.py
@@ -1534,3 +1534,32 @@ class StartProject(LiveServerTestCase, AdminScriptTestCase):
             with open(os.path.join(base_path, f)) as fh:
                 self.assertEqual(fh.read(),
                     '# some file for customtestproject test project')
+
+    def test_custom_project_template_context_variables(self):
+        "Make sure template context variables are rendered with proper values"
+        template_path = os.path.join(test_dir, 'admin_scripts', 'custom_templates', 'project_template')
+        args = ['startproject', '--template', template_path, 'another_project', 'project_dir']
+        testproject_dir = os.path.join(test_dir, 'project_dir')
+        os.mkdir(testproject_dir)
+        out, err = self.run_django_admin(args)
+        self.addCleanup(shutil.rmtree, testproject_dir)
+        self.assertNoOutput(err)
+        test_manage_py = os.path.join(testproject_dir, 'manage.py')
+        with open(test_manage_py, 'r') as fp:
+            content = fp.read()
+            self.assertIn("project_name = 'another_project'", content)
+            self.assertIn("project_directory = '%s'" % testproject_dir, content)
+
+    def test_custom_project_destination_missing(self):
+        """
+        Make sure an exception is raised when the provided
+        destination directory doesn't exist
+        """
+        template_path = os.path.join(test_dir, 'admin_scripts', 'custom_templates', 'project_template')
+        args = ['startproject', '--template', template_path, 'yet_another_project', 'project_dir2']
+        testproject_dir = os.path.join(test_dir, 'project_dir2')
+        out, err = self.run_django_admin(args)
+        self.assertNoOutput(out)
+        self.assertOutput(err, "Destination directory '%s' does not exist, please create it first." % testproject_dir)
+        self.assertFalse(os.path.exists(testproject_dir))
+