Skip to content

Commit 95804f1

Browse files
committed
some validation clean up
1 parent e503ba4 commit 95804f1

File tree

3 files changed

+27
-16
lines changed

3 files changed

+27
-16
lines changed

ellar_cli/file_scaffolding.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ def __init__(
2828
specified_directory: t.Optional[str] = None,
2929
) -> None:
3030
self._specified_directory = specified_directory
31-
if specified_directory and specified_directory.startswith("/"):
32-
self._specified_directory = specified_directory[1:]
3331

3432
self._schema = schema
3533
self._ctx = ProjectScaffoldContext(Environment())

ellar_cli/manage_commands/new.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,6 @@ def is_directory_empty(self) -> bool:
8585
return True
8686

8787
def validate_project_name(self) -> None:
88-
if os.path.exists(self._working_project_name):
89-
message = "A folder with same name exist '{name}' ".format(
90-
name=self._working_project_name
91-
)
92-
raise EllarCLIException(message)
93-
9488
if not self.is_directory_empty():
9589
working_project_dir = os.path.join(
9690
self._working_directory, self._working_project_name

tests/test_ellar_commands/test_new_command.py

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def test_new_command_works(tmpdir, process_runner):
2525
}
2626

2727

28-
def test_new_command_works_with_specific_directory(tmpdir, process_runner):
28+
def test_new_command_works_with_specific_directory_case_1(tmpdir, process_runner):
2929
result = process_runner(["ellar", "new", "ellar-project-new", "Another/me"])
3030
assert result.returncode == 0
3131
assert result.stdout.decode("utf8") == (
@@ -45,6 +45,25 @@ def test_new_command_works_with_specific_directory(tmpdir, process_runner):
4545
}
4646

4747

48+
def test_new_command_works_with_specific_directory_case_3(tmpdir, process_runner):
49+
_path = tmpdir / "23-August-2023"
50+
os.makedirs(_path)
51+
result = process_runner(["ellar", "new", "ellar-project-new", str(_path)])
52+
assert result.returncode == 0
53+
assert (
54+
"ellar --project ellar_project_new runserver --reload"
55+
in result.stdout.decode("utf8")
56+
)
57+
os.chdir(os.path.join(_path))
58+
ellar_cli_service = EllarCLIService.import_project_meta()
59+
assert ellar_cli_service._meta.dict() == {
60+
"project_name": "ellar_project_new",
61+
"application": "ellar_project_new.server:application",
62+
"config": "ellar_project_new.config:DevelopmentConfig",
63+
"root_module": "ellar_project_new.root_module:ApplicationModule",
64+
}
65+
66+
4867
def test_new_command_fails_case_1(tmpdir, process_runner):
4968
result = process_runner(["ellar", "new", "ellar-project-new", "Another/me"])
5069
assert result.returncode == 0
@@ -72,13 +91,13 @@ def test_new_command_works_with_specific_directory_case_2(tmpdir, process_runner
7291
}
7392

7493

75-
def test_new_command_fails_for_existing_folder_name(tmp_path, process_runner):
76-
os.makedirs(tmp_path / "ellar-project-exist", exist_ok=True)
77-
result = process_runner(["ellar", "new", "ellar-project-exist"])
78-
assert result.returncode == 1
79-
assert result.stderr.decode("utf8") == (
80-
"Error: A folder with same name exist 'ellar-project-exist' \n"
81-
)
94+
# def test_new_command_fails_for_existing_folder_name(tmp_path, process_runner):
95+
# os.makedirs(tmp_path / "ellar-project-exist", exist_ok=True)
96+
# result = process_runner(["ellar", "new", "ellar-project-exist"])
97+
# assert result.returncode == 1
98+
# assert result.stderr.decode("utf8") == (
99+
# "Error: A folder with same name exist 'ellar-project-exist' \n"
100+
# )
82101

83102

84103
def test_new_command_fails_for_invalid_project_name(tmp_path, process_runner):

0 commit comments

Comments
 (0)