Fixing failing tests

Author: cpraschl

src/archetype/archetype.py

@@ -71,14 +71,16 @@ def create(
         self,
         projectname: str,
         pythonversion: str,
-        targetfolder: str
+        targetfolder: str,
+        templatefolder: str = os.path.join(os.getcwd(), "template")
     ) -> str:
         """
         Creates the project based on the given project name
 
         :param projectname: name of the project
         :param pythonversion: Python version used for the generated project
         :param targetfolder: Target folder where the generated project should be saved
+        :param templatefolder: source folder of the project template
         :return: returns the path where the project was created
         """
         if projectname.isalnum():
@@ -87,7 +89,7 @@ def create(
 
             # create target base folder and move all basic elements like Readme.md
             os.makedirs(projectfolder, 0o775)
-            self.copy_all_files(os.path.join(os.getcwd(), "template"), projectfolder, projectname, pythonversion)
+            self.copy_all_files(templatefolder, projectfolder, projectname, pythonversion)
             return projectfolder
 
         else:

tests/archetype/test_archetype.py

@@ -14,7 +14,7 @@ def cleanup():
         :return:
         """
         current_directory = os.getcwd()
-        test_folder = current_directory + os.path.sep + "test"
+        test_folder = os.path.join(current_directory, "template")
         pycache_folder = current_directory + os.path.sep + "__pycache__"
         if os.path.exists(test_folder) and os.path.isdir(test_folder):
             shutil.rmtree(test_folder)
@@ -31,13 +31,13 @@ def test_archetype(self):
         # given
         self.cleanup()
         archetype = Archetype()
-        path = os.path.join(os.getcwd().replace("tests", "src"), "template")
+        path = os.path.join(os.getcwd().replace("tests", "src"), os.getcwd(), "template")
 
         # when
-        result = archetype.create("test", path)
+        result = archetype.create("test", "3.7", path, os.path.join(os.getcwd().replace("tests", "src"), "template"))
 
         # then
-        self.assertEqual(result, os.path.join(os.getcwd(), "test"))
+        self.assertEqual(result, os.path.join(path, "test"))
 
         if os.path.exists(result) and os.path.isdir(result):
             shutil.rmtree(result)